Adding timers and making few simplifications.