Reworking the shipping confirmation