Improved Clock and TempoClock.