adjust to refactoring in reordering handling and simplify reorders