Push time to back and refactoring