Rewrote the timer