Added shipment specs
Added a few comments
merge conflict