Updated for modal picker