3 Commits (refactor_v1.0)