Implementing changes to accomodate ClientMidClock.