Worked on timers
Fixed merge