Tweak timings
Moving things around