Added the master timer