Change how delivery_date works