Weather complete clocks refactored