clock up cleaned up, need to merge up and down