pick up and drop now fully functional