tehn switch to clock, clean up