improve timings - Darron Broad