Re-order things to stop us shooting ourself in the foot