Changed how some timers work