6 Commits (refactor_history)