Updates to the timing stuff