updated timing stuff