undid previous timing stuff
fixed merge conflict
removing timing stuff