Commit before refactoring first hand logic