More Delivery Improvements

//More Delivery Improvements