#99 added ability to choose what to pick up