Better clock management