last commit before major refactoring