making some adjustments, more safety on clock backwards