Added some timer functionality