#660 - update for new clock scheme