Improved the optimisation again.