Changed some timer methods