Improved optimisation 2