added else statements for pickUp and dropOff