one more round of timing tweaking