Moved changes from ClockFOUR_TiM to ClockFOUR_30