country formatting and fields added