Changing a few timings around