Made some changes to the timer