REVERTED - Clock fix changes