Updated delivery date logic