Timings removed until fully working