CPP UPGRADE: INCORPORATING LATEST “CLOCK VERSION”