Starting to fiddle with optimisation.