Updated for clock library