Made some changes to how timers work