Regroup and reorder