Commented out optimisation.