ENH: Clock substitution