Fixed all the timer