reorder some fns