Logic for the Delivery added