Better clock (7/24)

Better clock