Improved picking
Resolved merge conflicts