revising _prepare_picking_order