merge in Mark's code for Clock Synching