reorder some unfolds