Updated Timing Functions