Better clock (4/24)

Better clock