mainly changes in shipment
added fields accordingly in view and model