Added changes to pickandplace