New commit after refactoring