A number of changes in an attempt to optimise.