Better handling of timers