Started the timer
Merged branch