[IMP] Use SO's picking policy for the new picking