updates for pick and place
merge