improving timers logic