Improved timings