better handling of timers