Rejig order in head a bit