made pick up at feature more sophisticated