Bring Order up to current spec.