So do we no longer need the deliveryInfo at this level or should it be placed back here?