New: Clock version 2