Improved picking