added new-clock
cleaning up a bit