Improve picking.