refactored the delivery_continue and delivery_at_pickup