* Changed the way the timer works