re-order slightly