commit before total refactoring