commit befor yet another refactoring