Moved Timer restart for better cohesion