commit before refactoring as a backup