Slight tweak to timing