fixed changes to timer (sorry nick)