match_reorder changes