Version before refactoring