substantial performance overhaul on clock