8 Commits (refactor)