improve re-order