In process of refactoring, added usage of timer