Reorder functions again