version before major refactoring