DROP-OFF/PICK-UP REVISED