Without tests and refactoring