Changed the timer stuff a but