Updated delivery date logic should be bug-free now.