sclock_refactor branch has now been merged onto master