(wip) dropping current_order