Changes for the timer to work