Timing refinement per #46