changed composing of ShippingCountry