Pick up and drop off changes

Pick up and drop off changes