Timers now working approprietly