added more timing stuff