cleaned off more time funcitons