Made a few changes for timings