addresses the timer issue, better