Updated Timing and its implementations to work accurately