Updated to include timings