Push delay added
Refactoring of the project done