Pushing Again refactoring