Including Estimated Delivery and correction for quoting