first commit after refactoring