Improve picking