Better Handling of timers creating new versions overnight