Improvements for optimisation.