ClockHandling added
Merge with cleverrainbow