Better clock (8/24)

Better clock