Timing improvement