Many changes, commit before refactoring