31.7.2013 before major refactoring