telephone_number 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fed8af28e90140c2209ac49396ecea2fc26d49f6
-  data.tar.gz: 37cd210bbe7ec6fdc4275aad372481621ba992f5
+SHA256:
+  metadata.gz: 6ca767604c547da12004d09a1995360760d5ea901d8534c294c7b4070dbd2bcb
+  data.tar.gz: 386411966ee304ab210706a02266d464b1dd69d087b40d4a1a901f086cd9d8bb
 SHA512:
-  metadata.gz: c0ca873d692ae5d8d1afa301d48927f3ddd2fdd1182706d58597aa48e2aa14c2cdbfb2b3d4f05fadedf10bf3199e5b27951d0f0b45ef70ffeb8ae6821cb43969
-  data.tar.gz: bdf4418a685b52bc65ddc1983fe47f2de164306e4f433cf0425dbea9e7d7ac8acfad7e52497c277ec99e49ecaae7a5c33198d7ff0f5df39d3df7e44aadf6d8b3
+  metadata.gz: bf49a17823d4b9505c94832bae4a5586700d13208ea5b8143cf35e614b3b77f9ffe74370b1678fee14a6a1f11f461f891ca9500ef19308872d86b8f1811bdc6a
+  data.tar.gz: cf13c443a95e7eb143f56c8b966614454a3fd5f809b6407658d308fd5f538dcc1ea70dac49b9c48e6dd0c3071e2c6a79a87dfeaf90da69f35a3bdf792c383682

data/.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 language: ruby
 rvm:
   - 2.4.3

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+All notable changes to this project are documented here.
+
+## v1.4.10 - 2021-03-18
+* Bring data up to date with [upstream](https://github.com/google/libphonenumber/releases/tag/v8.12.20).

data/README.md

@@ -26,6 +26,10 @@ Or install it yourself as:
 
     $ gem install telephone_number
 
+## Supported Ruby Versions
+
+This library requires Ruby 2.4 or later.
+
 ## Rails Validation
 
 `validates :my_attribute_name, telephone_number: {country: proc{|record| record.country}, types: [:fixed_line, :mobile, etc]}`

data/data/geocoding/en/1.txt

@@ -10930,6 +10930,7 @@
 1443949|Annapolis, MD
 1443977|Baltimore, MD
 1445|Philadelphia
+1447|Illinois
 1450|Quebec
 1450218|Vaudreuil-Dorion, QC
 1450224|Prévost, QC
@@ -11111,6 +11112,7 @@
 1469916|Dallas, TX
 1469952|McKinney, TX
 1470|Georgia
+1474|Saskatchewan
 1475|Connecticut
 1478|Georgia
 1478218|Perry, GA
@@ -25941,6 +25943,7 @@
 1832934|Magnolia, TX
 1838|New York
 1839|South Carolina
+1840|California
 1843|South Carolina
 1843207|North Charleston, SC
 1843208|Hardeeville, SC
@@ -26594,7 +26597,7 @@
 1850983|Milton, FL
 1850994|Milton, FL
 1850997|Monticello, FL
-1854|Ohio
+1854|South Carolina
 1856|New Jersey
 1856205|Vineland, NJ
 1856216|Cherry Hill, NJ
@@ -30627,6 +30630,7 @@
 194195|Sarasota, FL
 1941964|Boca Grande, FL
 1941979|Port Charlotte, FL
+1945|Texas
 1947|Michigan
 1949|California
 1949221|Irvine, CA

data/data/geocoding/en/225.txt

@@ -29,6 +29,28 @@
 225234|Banco, Abidjan
 225235|Banco, Abidjan
 22524|Abobo, Abidjan
+22525200|Plateau, Abidjan
+22525210|Abidjan (southeast)
+22525220|Cocody, Abidjan
+22525230|Banco, Abidjan
+22525240|Abobo, Abidjan
+22525300|Yamoussoukro
+22525310|Bouaké
+22525320|Daloa
+22525330|Man
+22525340|San-Pédro
+22525350|Abengourou
+22525360|Korhogo
+2252720|Plateau, Abidjan
+2252721|Abidjan (southeast)
+2252722|Cocody, Abidjan
+2252723|Banco, Abidjan
+2252724|Abobo, Abidjan
+2252730|Yamoussoukro
+2252731|Bouaké
+2252732|Daloa
+2252733|Man
+2252734|San-Pédro
 22530|Yamoussoukro
 22531|Bouaké
 22532|Daloa

data/data/geocoding/en/267.txt

@@ -39,6 +39,7 @@
 26749|Palapye
 267530|Lobatse
 267533|Lobatse
+267534|Lobatse
 267538|Ramotswa
 267539|Ramotswa
 26754|Barolong/Ngwaketse

data/data/geocoding/en/44.txt

@@ -17,7 +17,12 @@
 # with multiple corrections and fixes applied (see previous commits).
 
 44113|Leeds
-44114|Sheffield
+441140|Sheffield
+441141|Sheffield
+441142|Sheffield
+441143|Sheffield
+441144|Sheffield
+441145|Sheffield
 44115|Nottingham
 44116|Leicester
 44117|Bristol

data/data/geocoding/en/504.txt

@@ -16,6 +16,7 @@
 
 5042200|Polo Paz
 5042201|Polo Paz
+5042202|Tegucigalpa
 5042203|Polo Paz
 5042209|Res. Centro América, Tegucigalpa
 5042211|El Picacho

data/data/geocoding/en/598.txt

@@ -17,8 +17,16 @@
 598433|Canelones
 598434|San Jose de Mayo
 598435|Florida
-598436|Durazno
+5984360|Durazno
+5984361|Durazno
+5984362|Durazno
+5984363|Durazno
 5984364|Trinidad/Flores
+5984365|Durazno
+5984366|Durazno
+5984367|Durazno
+5984368|Durazno
+5984369|Durazno
 598444|Minas/Lavalleja
 598445|Treinta y Tres
 598447|Rocha

data/data/geocoding/en/61.txt

@@ -42456,7 +42456,7 @@
 61851086|Wyndham
 61851087|Broome
 61851088|Christmas Island
-61851089|Cocos (Keeling) Island
+61851089|Cocos Island
 61851090|Dampier
 61851091|De Grey
 61851092|Derby
@@ -42542,6 +42542,7 @@
 61851173|Wyndham
 61851174|Broome
 61851175|Christmas Island
+61851176|Cocos Island
 61851177|Dampier
 61851178|De Grey
 61851179|Derby
@@ -42573,10 +42574,31 @@
 61851205|Port Hedland
 61851206|Dampier
 61851207|De Grey
+61851209|Mitchell
+61851211|Mount Bruce
+61851213|Newman
+61851215|Onslow
+61851217|Ord
+61851219|Pannawonica
+61851221|Paraburdoo
+61851222|Christmas Island
+61851223|Cocos Island
+61851224|Dampier
+61851225|De Grey
+61851226|Derby
+61851227|Fitzroy Crossing
+61851228|Great Sandy
+61851229|Hall's Creek
+61851230|Karratha
+61851231|Kununurra
 61851232|Port Hedland
 61851233|Port Hedland
 61851234|Broome
 61851235|Christmas Island
+61851236|Leopold
+61851237|Marble Bar
+61851238|Millstream
+61851239|Mitchell
 6185124|Karratha
 61851250|Newman
 61851251|Onslow
@@ -42594,6 +42616,19 @@
 61851263|Whaleback
 61851264|Wittenoom
 61851265|Wyndham
+61851267|Roebuck
+61851269|Sandfire
+6185127|Port Hedland
+61851281|Telfer
+61851283|Tom Price
+61851285|Whaleback
+61851287|Wittenoom
+61851289|Wyndham
+61851290|Telfer
+61851291|Tom Price
+61851292|Whaleback
+61851293|Wittenoom
+61851294|Wyndham
 61860000|Kalgoorlie
 61860001|Burracoppin
 61860002|Burracoppin
@@ -55932,6 +55967,7 @@
 61891700|Christmas Island
 61891701|Christmas Island
 61891702|Cocos Island
+61891703|Cocos Island
 61891704|Fitzroy Crossing
 61891705|Fitzroy Crossing
 61891706|Great Sandy
@@ -56063,14 +56099,8 @@
 61891938|Broome
 61891939|Derby
 6189194|Broome
-61891950|Broome
-61891951|Broome
-61891952|Broome
-61891953|Broome
-61891954|Broome
-61891955|Broome
-61891956|Broome
-61891957|Broome
+6189195|Broome
+61891958|Christmas Island
 61891959|Cocos Island
 61891960|Broome
 61891961|Derby

data/data/geocoding/en/81.txt

@@ -693,7 +693,15 @@
 815997|Ago, Mie
 815998|Ago, Mie
 815999|Tsu, Mie
-816|Osaka, Osaka
+8161|Osaka, Osaka
+8162|Osaka, Osaka
+8163|Osaka, Osaka
+8164|Osaka, Osaka
+8165|Osaka, Osaka
+8166|Osaka, Osaka
+8167|Osaka, Osaka
+8168|Osaka, Osaka
+8169|Osaka, Osaka
 81721|Tondabayashi, Osaka
 81722|Sakai, Osaka
 81723|Sakai, Osaka

data/data/geocoding/en/961.txt

@@ -0,0 +1,23 @@
+# Copyright (C) 2021 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# https://www.itu.int/oth/T0202000077/en
+
+96121|Beirut
+96124|Metn
+96125|Chouf
+96126|North Lebanon
+96127|South Lebanon
+96128|Bekaa
+96129|Jbeil & Keserwan

data/data/geocoding/fr/225.txt

@@ -31,6 +31,28 @@
 225234|Banco, Abidjan
 225235|Banco, Abidjan
 22524|Abobo, Abidjan
+22525200|Plateau, Abidjan
+22525210|Abidjan (southeast)
+22525220|Cocody, Abidjan
+22525230|Banco, Abidjan
+22525240|Abobo, Abidjan
+22525300|Yamoussoukro
+22525310|Bouaké
+22525320|Daloa
+22525330|Man
+22525340|San-Pédro
+22525350|Abengourou
+22525360|Korhogo
+2252720|Plateau, Abidjan
+2252721|Abidjan (southeast)
+2252722|Cocody, Abidjan
+2252723|Banco, Abidjan
+2252724|Abobo, Abidjan
+2252730|Yamoussoukro
+2252731|Bouaké
+2252732|Daloa
+2252733|Man
+2252734|San-Pédro
 22530|Yamoussoukro
 22531|Bouaké
 22532|Daloa

data/data/geocoding/ja/81.txt

@@ -759,7 +759,15 @@
 815997|阿児
 815998|阿児
 815999|津
-816|大阪
+8161|大阪
+8162|大阪
+8163|大阪
+8164|大阪
+8165|大阪
+8166|大阪
+8167|大阪
+8168|大阪
+8169|大阪
 81721|富田林
 81722|堺
 81723|堺

data/data/telephone_number_data_file.xml

@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2009 The Libphonenumber Authors
+ <!-- Copyright (C) 2009 The Libphonenumber Authors
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -385,25 +385,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -503,25 +510,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -586,6 +600,7 @@
         <possibleLengths national="8" localOnly="[5-7]"/>
         <exampleNumber>22345678</exampleNumber>
         <nationalNumberPattern>
+          4505[0-2]\d{3}|
           (?:
             [2358][16-9]\d[2-9]|
             4410
@@ -906,7 +921,7 @@
               0[0-35-7]|
               1[02-5]|
               2[015]|
-              34|
+              3[47]|
               4[478]
             )|
             911
@@ -1393,6 +1408,10 @@
           <format>$2 15-$3-$4</format>
           <intlFormat>$1 $2 $3-$4</intlFormat>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{5})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>8</leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
         <numberFormat pattern="(\d)(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>9</leadingDigits>
           <format>$2 15-$3-$4</format>
@@ -1401,11 +1420,11 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          11\d{8}|
           (?:
-            [2368]|
-            9\d
-          )\d{9}
+            11|
+            [89]\d\d
+          )\d{8}|
+          [2368]\d{9}
         </nationalNumberPattern>
       </generalDesc>
       <noInternationalDialling>
@@ -1945,9 +1964,9 @@
         </nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="10"/>
+        <possibleLengths national="10,11"/>
         <exampleNumber>8001234567</exampleNumber>
-        <nationalNumberPattern>800\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>800\d{7,8}</nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="10"/>
@@ -2036,25 +2055,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -2387,56 +2413,74 @@
         <possibleLengths national="9" localOnly="8"/>
         <exampleNumber>212345678</exampleNumber>
         <nationalNumberPattern>
-          8(?:
-            51(?:
-              0(?:
-                0[03-9]|
-                [12479]\d|
-                3[2-9]|
-                5[0-8]|
-                6[1-9]|
-                8[0-7]
+          (?:
+            (?:
+              2(?:
+                [0-26-9]\d|
+                3[0-8]|
+                4[02-9]|
+                5[0135-9]
               )|
-              1(?:
-                [0235689]\d|
-                1[0-69]|
-                4[0-589]|
-                7[0-47-9]
+              3(?:
+                [0-3589]\d|
+                4[0-578]|
+                6[1-9]|
+                7[0-35-9]
               )|
-              2(?:
-                0[0-7]|
-                3[2-4]|
-                [4-6]\d
+              7(?:
+                [013-57-9]\d|
+                2[0-8]
               )
-            )|
-            91(?:
-              [0-57-9]\d|
-              6[0135-9]
-            )\d
-          )\d{3}|
-          (?:
-            2(?:
-              [0-26-9]\d|
-              3[0-8]|
-              4[02-9]|
-              5[0135-9]
-            )|
-            3(?:
-              [0-3589]\d|
-              4[0-578]|
-              6[1-9]|
-              7[0-35-9]
-            )|
-            7(?:
-              [013-57-9]\d|
-              2[0-8]
-            )|
+            )\d{3}|
             8(?:
-              6[0-8]|
-              [78]\d|
-              9[02-9]
+              51(?:
+                0(?:
+                  0[03-9]|
+                  [12479]\d|
+                  3[2-9]|
+                  5[0-8]|
+                  6[1-9]|
+                  8[0-7]
+                )|
+                1(?:
+                  [0235689]\d|
+                  1[0-69]|
+                  4[0-589]|
+                  7[0-47-9]
+                )|
+                2(?:
+                  0[0-79]|
+                  [18][13579]|
+                  2[14-9]|
+                  3[0-46-9]|
+                  [4-6]\d|
+                  7[89]|
+                  9[0-4]
+                )
+              )|
+              (?:
+                6[0-8]|
+                [78]\d
+              )\d{3}|
+              9(?:
+                [02-9]\d{3}|
+                1(?:
+                  (?:
+                    [0-58]\d|
+                    6[0135-9]
+                  )\d|
+                  7(?:
+                    0[0-24-9]|
+                    [1-9]\d
+                  )|
+                  9(?:
+                    [0-46-9]\d|
+                    5[0-79]
+                  )
+                )
+              )
             )
-          )\d{6}
+          )\d{3}
         </nationalNumberPattern>
       </fixedLine>
       <!-- Note CC and CX should be updated as well if this pattern changes. Maintaining three digit
@@ -2866,7 +2910,7 @@
         <possibleLengths national="8,9"/>
         <exampleNumber>61123456</exampleNumber>
         <nationalNumberPattern>
-          6040[0-4]\d{4}|
+          6040\d{5}|
           6(?:
             03|
             [1-356]|
@@ -2899,7 +2943,9 @@
         <possibleLengths national="8"/>
         <exampleNumber>70341234</exampleNumber>
         <nationalNumberPattern>
+          703[235]0\d{3}|
           70(?:
+            2[0-5]|
             3[0146]|
             [56]0
           )\d{4}
@@ -3004,25 +3050,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -3936,12 +3989,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>
-          (?:
-            [2689]\d|
-            51
-          )\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>[25689]\d{7}</nationalNumberPattern>
       </generalDesc>
       <!-- These come from the national numbering plan, but have been widened to include other
            prefixes found in the yellow pages - specifically 21 0. -->
@@ -3966,7 +4014,7 @@
         <exampleNumber>90011234</exampleNumber>
         <nationalNumberPattern>
           (?:
-            51|
+            5[1-35-8]|
             6\d|
             9[013-9]
           )\d{6}
@@ -4108,25 +4156,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -4659,25 +4714,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -4770,21 +4832,38 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{4})">
-          <leadingDigits>[2-6]</leadingDigits>
+          <leadingDigits>
+            [24-6]|
+            3[15-79]
+          </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
-          <leadingDigits>7</leadingDigits>
+          <leadingDigits>[37]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{3})(\d{3})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{4})(\d{3})">
+          <leadingDigits>8</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          90\d{5}|
           (?:
-            [2-6]|
-            7\d
-          )\d{6}
+            0800|
+            (?:
+              [37]|
+              800
+            )\d
+          )\d{6}|
+          (?:
+            [2-6]\d|
+            90
+          )\d{5}
         </nationalNumberPattern>
       </generalDesc>
       <!-- Number range 373 is been supported based on user report and online evidence. -->
@@ -4810,7 +4889,7 @@
               9[0-5]
             )|
             5(?:
-              3[0389]|
+              3[03489]|
               4[0489]|
               7[1-47]|
               88|
@@ -4831,15 +4910,27 @@
         <exampleNumber>71123456</exampleNumber>
         <nationalNumberPattern>
           77200\d{3}|
-          7(?:
-            [1-6]\d|
-            7[013-9]
+          (?:
+            321|
+            7(?:
+              [1-6]\d|
+              7[013-9]|
+              8[01]
+            )
           )\d{5}
         </nationalNumberPattern>
       </mobile>
-      <!-- No reliable information about toll-free numbers can be found; many are written on the
-           internet like 0800 123 456, but this is not supported by any documentation and no
-           numbers can be found that actually work. -->
+      <!-- BOCRA (official authority) and many Government websites mention 0800 XXX XXX range. -->
+      <tollFree>
+        <possibleLengths national="10"/>
+        <exampleNumber>0800012345</exampleNumber>
+        <nationalNumberPattern>
+          (?:
+            0800|
+            800\d
+          )\d{6}
+        </nationalNumberPattern>
+      </tollFree>
       <premiumRate>
         <possibleLengths national="7"/>
         <exampleNumber>9012345</exampleNumber>
@@ -5148,7 +5239,8 @@
               03|
               1[68]|
               3[178]|
-              50
+              50|
+              74
             )|
             5(?:
               06|
@@ -5199,7 +5291,8 @@
               03|
               1[68]|
               3[178]|
-              50
+              50|
+              74
             )|
             5(?:
               06|
@@ -5256,25 +5349,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           (?:
             5(?:
               00|
@@ -5330,7 +5430,11 @@
                 60|
                 89
               )|
-              118
+              1(?:
+                18|
+                76
+              )|
+              223
             )|
             91(?:
               0(?:
@@ -5544,7 +5648,20 @@
       <mobile>
         <possibleLengths national="9"/>
         <exampleNumber>061234567</exampleNumber>
-        <nationalNumberPattern>0[14-6]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          026(?:
+            1[0-5]|
+            6[6-9]
+          )\d{4}|
+          0(?:
+            [14-6]\d\d|
+            2(?:
+              40|
+              5[5-8]|
+              6[07-9]
+            )
+          )\d{5}
+        </nationalNumberPattern>
       </mobile>
       <!-- Referred to as a "Green number" in the telephone plan. -->
       <!-- Using this to represent Value Added Service in the plan. -->
@@ -5657,23 +5774,61 @@
       <availableFormats>
         <!-- Using format from online yellow pages over format implied in national numbering plan. -->
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>[02-9]</leadingDigits>
+          <leadingDigits>
+            [03-9]|
+            2(?:
+              [02-4]|
+              1[023578]
+            )
+          </leadingDigits>
+          <leadingDigits>
+            [03-9]|
+            2(?:
+              [02-4]|
+              1(?:
+                [02357]|
+                80
+              )
+            )
+          </leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{2})(\d)(\d{5})">
+          <leadingDigits>2</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{4})">
+          <leadingDigits>0</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[02-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          [02]\d{9}|
+          [02-9]\d{7}
+        </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="8"/>
+        <possibleLengths national="8,10"/>
         <exampleNumber>21234567</exampleNumber>
         <nationalNumberPattern>
           (?:
             2(?:
               0[023]|
-              1[02357]|
-              [23][045]|
-              4[03-5]
+              [15]\d{3}|
+              7(?:
+                2(?:
+                  0[23]|
+                  1[2357]|
+                  [23][45]|
+                  4[3-5]
+                )|
+                3(?:
+                  06|
+                  1[69]|
+                  [2-6]7
+                )
+              )
             )|
             3(?:
               0[06]|
@@ -5682,6 +5837,11 @@
               5[09]|
               6[08]
             )
+          )\d{5}|
+          2(?:
+            1[02357]|
+            [23][045]|
+            4[03-5]
           )\d{5}
         </nationalNumberPattern>
       </fixedLine>
@@ -5691,20 +5851,26 @@
            50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire.
            Prefix 73 and 97[0-3] are added based on user reports. -->
       <mobile>
-        <possibleLengths national="8"/>
+        <possibleLengths national="8,10"/>
         <exampleNumber>01234567</exampleNumber>
         <nationalNumberPattern>
           (?:
-            2[0-3]80|
-            97[0-3]\d
+            (?:
+              0(?:
+                [15]\d\d|
+                7(?:
+                  [04-8][7-9]|
+                  9[78]
+                )
+              )|
+              [457]\d|
+              6[014-9]|
+              8[4-9]|
+              9[4-8]
+            )\d\d|
+            2[0-3]80
           )\d{4}|
-          (?:
-            0[1-9]|
-            [457]\d|
-            6[014-9]|
-            8[4-9]|
-            95
-          )\d{6}
+          0[1-9]\d{6}
         </nationalNumberPattern>
       </mobile>
     </territory>
@@ -5865,12 +6031,12 @@
               3(?:
                 2\d\d|
                 3(?:
-                  0\d|
+                  [034]\d|
                   1[0-35-9]|
                   2[1-9]|
-                  3[0-2]|
-                  40
-                )
+                  5[0-2]
+                )|
+                600
               )
             )|
             80[1-9]\d\d|
@@ -5932,12 +6098,12 @@
               3(?:
                 2\d\d|
                 3(?:
-                  0\d|
+                  [034]\d|
                   1[0-35-9]|
                   2[1-9]|
-                  3[0-2]|
-                  40
-                )
+                  5[0-2]
+                )|
+                600
               )
             )|
             80[1-9]\d\d|
@@ -6010,7 +6176,7 @@
     <!-- Cameroon (CM) -->
     <!-- http://www.itu.int/oth/T0202000024/en -->
     <!-- http://www.itu.int/dms_pub/itu-t/opb/sp/T-SP-OB.1063-2014-OAS-PDF-E.pdf -->
-    <territory id="CM" countryCode="237" internationalPrefix="00">
+    <territory id="CM" countryCode="237" internationalPrefix="00" mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
           <leadingDigits>88</leadingDigits>
@@ -6019,16 +6185,17 @@
         <!-- Formatting in the ITU update document aligns with formatting online (all 2 digit
              groups). For the new number format with 9 digits the first digit has it's own group. -->
         <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>[26]</leadingDigits>
+          <leadingDigits>
+            [26]|
+            88
+          </leadingDigits>
           <format>$1 $2 $3 $4 $5</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            [26]\d\d|
-            88
-          )\d{6}
+          [26]\d{8}|
+          88\d{6,7}
         </nationalNumberPattern>
       </generalDesc>
       <!-- CDMA numbers are described in a subcategory to fixed line numbers in the ITU update
@@ -6058,9 +6225,9 @@
            starting with 88 have been found online. These are all listed as being "numéro vert",
            "ligne verte" or "gratuit" (free). -->
       <tollFree>
-        <possibleLengths national="8"/>
+        <possibleLengths national="8,9"/>
         <exampleNumber>88012345</exampleNumber>
-        <nationalNumberPattern>88\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>88\d{6,7}</nationalNumberPattern>
       </tollFree>
     </territory>
 
@@ -7124,9 +7291,12 @@
             )|
             [4-9]\d\d
           )\d{3}|
-          33(?:
-            00|
-            3[0-24-9]
+          3(?:
+            24[2-6]|
+            3(?:
+              00|
+              3[0-24-9]
+            )
           )\d{6}|
           3(?:
             0[0-5]|
@@ -7488,7 +7658,10 @@
                 46|
                 75
               )|
-              235
+              2(?:
+                22|
+                35
+              )
             )|
             91(?:
               00[6-9]|
@@ -8012,25 +8185,32 @@
         <nationalNumberPattern>
           [2579]\d{5,14}|
           49(?:
-            [05]\d{10}|
-            [46][1-8]\d{4,9}
-          )|
+            [34]0|
+            69|
+            8\d
+          )\d\d?|
           49(?:
-            [0-25]\d|
-            3[1-689]|
-            7[1-7]
-          )\d{4,8}|
+            37|
+            49|
+            60|
+            7[089]|
+            9\d
+          )\d{1,3}|
           49(?:
-            [0-2579]\d|
-            [34][1-9]|
-            6[0-8]
-          )\d{3}|
-          49\d{3,4}|
+            [12]\d|
+            3[2-689]|
+            7[1-7]
+          )\d{1,8}|
           (?:
             1|
             [368]\d|
             4[0-8]
-          )\d{3,13}
+          )\d{3,13}|
+          49(?:
+            [05]\d|
+            31|
+            [46][1-8]
+          )\d{1,9}
         </nationalNumberPattern>
       </generalDesc>
       <!-- The German ITU numbering plan gives overly simplistic minimum/maximum
@@ -8049,10 +8229,8 @@
         <possibleLengths national="[5-15]" localOnly="[2-4]"/>
         <exampleNumber>30123456</exampleNumber>
         <nationalNumberPattern>
-          (?:
-            32|
-            49[4-6]\d
-          )\d{9}|
+          32\d{9,11}|
+          49[3-6]\d{10}|
           49[0-7]\d{3,9}|
           (?:
             [34]0|
@@ -8366,7 +8544,7 @@
               7[5-7]
             )|
             31[5-7]|
-            61[1-7]|
+            61[1-8]|
             70[1-6]
           )\d{4}
         </nationalNumberPattern>
@@ -8397,25 +8575,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -8432,7 +8617,7 @@
     <!-- Dominican Republic (DO) -->
     <!-- Calling code and formatting shared with 'US' -->
     <!-- http://www.itu.int/oth/T020200003C/en -->
-    <territory id="DO" countryCode="1" leadingDigits="8[024]9" internationalPrefix="011"
+    <territory id="DO" countryCode="1" leadingDigits="8001|8[024]9" internationalPrefix="011"
                nationalPrefix="1" mobileNumberPortableRegion="true">
       <generalDesc>
         <nationalNumberPattern>
@@ -8510,14 +8695,19 @@
         <exampleNumber>8002123456</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            00|
-            33|
-            44|
-            55|
-            66|
-            77|
-            88
-          )[2-9]\d{6}
+            00(?:
+              14|
+              [2-9]\d
+            )|
+            (?:
+              33|
+              44|
+              55|
+              66|
+              77|
+              88
+            )[2-9]\d
+          )\d{5}
         </nationalNumberPattern>
       </tollFree>
       <premiumRate>
@@ -8531,25 +8721,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -9013,9 +9210,9 @@
               8[0-247-9]
             )|
             7(?:
-              0[016-8]|
+              0\d|
               6[1267]|
-              7[0-27]
+              7[0-57]
             )
           )\d{6}
         </nationalNumberPattern>
@@ -9687,12 +9884,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>
-          (?:
-            [2-8]\d|
-            90
-          )\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>[2-9]\d{5}</nationalNumberPattern>
       </generalDesc>
       <fixedLine>
         <possibleLengths national="6"/>
@@ -9711,7 +9903,8 @@
         <nationalNumberPattern>
           (?:
             [27][1-9]|
-            5\d
+            5\d|
+            91
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -9797,11 +9990,17 @@
         <possibleLengths national="9"/>
         <exampleNumber>612345678</exampleNumber>
         <nationalNumberPattern>
-          700\d{6}|
           (?:
-            6\d|
-            7[3-9]
-          )\d{7}
+            6(?:
+              [0-24-8]\d|
+              3[0-8]|
+              9[589]
+            )|
+            7(?:
+              00|
+              [3-9]\d
+            )
+          )\d{6}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -10073,106 +10272,108 @@
                   [0-58]\d\d|
                   73[03]
                 )|
+                4(?:
+                  [0-5]\d\d|
+                  69[7-9]
+                )|
                 (?:
-                  4[0-5]|
                   5[0-26-9]|
                   6[0-4]|
                   [78][0-49]
                 )\d\d
-              )|
-              2(?:
-                (?:
-                  0[024-9]|
-                  2[3-9]|
-                  3[3-79]|
-                  4[1-689]|
-                  [58][02-9]|
-                  6[0-47-9]|
-                  7[013-9]|
-                  9\d
-                )\d\d|
-                1(?:
-                  [0-7]\d\d|
-                  8(?:
-                    0\d|
-                    20
-                  )
-                )
-              )|
-              (?:
-                3(?:
-                  0\d|
-                  1[0-8]|
-                  [25][02-9]|
-                  3[02-579]|
-                  [468][0-46-9]|
-                  7[1-35-79]|
-                  9[2-578]
-                )|
-                4(?:
-                  0[03-9]|
-                  [137]\d|
-                  [28][02-57-9]|
-                  4[02-69]|
-                  5[0-8]|
-                  [69][0-79]
-                )|
-                5(?:
-                  0[1-35-9]|
-                  [16]\d|
-                  2[024-9]|
-                  3[015689]|
-                  4[02-9]|
-                  5[03-9]|
-                  7[0-35-9]|
-                  8[0-468]|
-                  9[0-57-9]
-                )|
-                6(?:
-                  0[034689]|
-                  1\d|
-                  2[0-35689]|
-                  [38][013-9]|
-                  4[1-467]|
-                  5[0-69]|
-                  6[13-9]|
-                  7[0-8]|
-                  9[0-24578]
-                )|
-                7(?:
-                  0[0246-9]|
-                  2\d|
-                  3[0236-8]|
-                  4[03-9]|
-                  5[0-46-9]|
-                  6[013-9]|
-                  7[0-35-9]|
-                  8[024-9]|
-                  9[02-9]
-                )|
-                8(?:
-                  0[35-9]|
-                  2[1-57-9]|
-                  3[02-578]|
-                  4[0-578]|
-                  5[124-9]|
-                  6[2-69]|
-                  7\d|
-                  8[02-9]|
-                  9[02569]
+              )|
+              (?:
+                2(?:
+                  (?:
+                    0[024-9]|
+                    2[3-9]|
+                    3[3-79]|
+                    4[1-689]|
+                    [58][02-9]|
+                    6[0-47-9]|
+                    7[013-9]|
+                    9\d
+                  )\d|
+                  1(?:
+                    [0-7]\d|
+                    8[02]
+                  )
                 )|
-                9(?:
-                  0[02-589]|
-                  [18]\d|
-                  2[02-689]|
-                  3[1-57-9]|
-                  4[2-9]|
-                  5[0-579]|
-                  6[2-47-9]|
-                  7[0-24578]|
-                  9[2-57]
-                )
-              )\d\d
+                (?:
+                  3(?:
+                    0\d|
+                    1[0-8]|
+                    [25][02-9]|
+                    3[02-579]|
+                    [468][0-46-9]|
+                    7[1-35-79]|
+                    9[2-578]
+                  )|
+                  4(?:
+                    0[03-9]|
+                    [137]\d|
+                    [28][02-57-9]|
+                    4[02-69]|
+                    5[0-8]|
+                    [69][0-79]
+                  )|
+                  5(?:
+                    0[1-35-9]|
+                    [16]\d|
+                    2[024-9]|
+                    3[015689]|
+                    4[02-9]|
+                    5[03-9]|
+                    7[0-35-9]|
+                    8[0-468]|
+                    9[0-57-9]
+                  )|
+                  6(?:
+                    0[034689]|
+                    1\d|
+                    2[0-35689]|
+                    [38][013-9]|
+                    4[1-467]|
+                    5[0-69]|
+                    6[13-9]|
+                    7[0-8]|
+                    9[0-24578]
+                  )|
+                  7(?:
+                    0[0246-9]|
+                    2\d|
+                    3[0236-8]|
+                    4[03-9]|
+                    5[0-46-9]|
+                    6[013-9]|
+                    7[0-35-9]|
+                    8[024-9]|
+                    9[02-9]
+                  )|
+                  8(?:
+                    0[35-9]|
+                    2[1-57-9]|
+                    3[02-578]|
+                    4[0-578]|
+                    5[124-9]|
+                    6[2-69]|
+                    7\d|
+                    8[02-9]|
+                    9[02569]
+                  )|
+                  9(?:
+                    0[02-589]|
+                    [18]\d|
+                    2[02-689]|
+                    3[1-57-9]|
+                    4[2-9]|
+                    5[0-579]|
+                    6[2-47-9]|
+                    7[0-24578]|
+                    9[2-57]
+                  )
+                )\d
+              )\d
             )|
             2(?:
               0[013478]|
@@ -10364,6 +10565,10 @@
         <possibleLengths national="10"/>
         <exampleNumber>7640123456</exampleNumber>
         <nationalNumberPattern>
+          76(?:
+            464|
+            652
+          )\d{5}|
           76(?:
             0[0-2]|
             2[356]|
@@ -10526,25 +10731,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -10787,6 +10999,10 @@
         <possibleLengths national="10"/>
         <exampleNumber>7640123456</exampleNumber>
         <nationalNumberPattern>
+          76(?:
+            464|
+            652
+          )\d{5}|
           76(?:
             0[0-2]|
             2[356]|
@@ -10966,7 +11182,12 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[256]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            [25]\d\d|
+            606
+          )\d{5}
+        </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
         <possibleLengths national="8"/>
@@ -10988,10 +11209,7 @@
         <nationalNumberPattern>
           (?:
             5[146-8]\d|
-            6(?:
-              06|
-              29
-            )
+            606
           )\d{5}
         </nationalNumberPattern>
       </mobile>
@@ -11146,7 +11364,7 @@
       <mobile>
         <possibleLengths national="9"/>
         <exampleNumber>601123456</exampleNumber>
-        <nationalNumberPattern>6[02356]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>6[0-356]\d{7}</nationalNumberPattern>
       </mobile>
       <!-- Gamma concept network is being listed as VoIP as per
            http://www.gammaconcept.com/internet%20sat.html -->
@@ -11268,7 +11486,7 @@
         <nationalNumberPattern>
           (?:
             222|
-            55[015]
+            55\d
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -11319,12 +11537,17 @@
           <leadingDigits>[2689]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{5})">
+          <leadingDigits>8</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           5005000\d{3}|
+          8\d{9,10}|
           (?:
-            [2689]\d|
+            [269]\d|
             70
           )\d{8}
         </nationalNumberPattern>
@@ -11406,9 +11629,9 @@
         </nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="10"/>
+        <possibleLengths national="10,11"/>
         <exampleNumber>8001234567</exampleNumber>
-        <nationalNumberPattern>800\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>800\d{7,8}</nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="10"/>
@@ -11630,25 +11853,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -11825,25 +12055,28 @@
         <possibleLengths national="8"/>
         <exampleNumber>21234567</exampleNumber>
         <nationalNumberPattern>
-          (?:
-            384[0-5]|
-            58(?:
-              0[1-8]|
-              1[2-9]
-            )
-          )\d{4}|
           (?:
             2(?:
               [13-9]\d|
               2[013-9]
-            )|
+            )\d|
             3(?:
-              [1569][0-24-9]|
-              4[0-246-9]|
-              7[0-24-69]|
-              89
+              (?:
+                [1569][0-24-9]|
+                4[0-246-9]|
+                7[0-24-69]
+              )\d|
+              8(?:
+                4[0-6]|
+                5[0-5]|
+                9\d
+              )
+            )|
+            58(?:
+              0[1-8]|
+              1[2-9]
             )
-          )\d{5}
+          )\d{4}
         </nationalNumberPattern>
       </fixedLine>
       <!-- Prefixes assigned to 'CMMobile Global Communications Ltd' are on hold as per Ofcom
@@ -11855,17 +12088,26 @@
         <nationalNumberPattern>
           (?:
             46(?:
-              [01][0-6]|
-              4[0-57-9]
+              0[0-7]|
+              1[0-6]|
+              4[0-57-9]|
+              5[0-8]|
+              6[0-4]
             )|
             5730|
-            626[01]|
-            707[1-5]|
+            6(?:
+              26[013-7]|
+              66[0-3]
+            )|
+            70(?:
+              7[1-5]|
+              8[0-4]
+            )|
             848[015-9]|
             929[03-9]
           )\d{4}|
           (?:
-            462|
+            46[23]|
             5(?:
               [1-59][0-46-9]|
               6[0-4689]|
@@ -11877,6 +12119,7 @@
               [268][0-57-9]|
               7[0-79]
             )|
+            849|
             9(?:
               0[1-9]|
               1[02-9]|
@@ -12021,7 +12264,7 @@
         <nationalNumberPattern>
           2(?:
             2(?:
-              0[0139]|
+              0[0-39]|
               1[1-36]|
               [23]\d|
               4[04-6]|
@@ -12353,7 +12596,7 @@
     <!-- From 2001, very out of date. -->
     <!-- http://www.itu.int/oth/T0202000064/en -->
     <!-- http://en.wikipedia.org/wiki/%2B62 -->
-    <territory id="ID" countryCode="62" internationalPrefix="00[189]" nationalPrefix="0">
+    <territory id="ID" countryCode="62" internationalPrefix="00[89]" nationalPrefix="0">
       <availableFormats>
         <!-- Short UAN numbers -->
         <numberFormat pattern="(\d)(\d{3})(\d{3})">
@@ -12404,6 +12647,12 @@
           <leadingDigits>8</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
+        <!-- 12 digit toll free numbers. -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>001</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
         <!-- Format for 13 digit ITFS numbers. -->
         <numberFormat pattern="(\d{2})(\d{4})(\d{3})(\d{4})">
           <leadingDigits>0</leadingDigits>
@@ -12415,11 +12664,12 @@
         <nationalNumberPattern>
           (?:
             (?:
-              007803|
-              8\d{4}
-            )\d|
+              00[1-9]|
+              8\d
+            )\d{4}|
             [1-36]
           )\d{6}|
+          00\d{10}|
           [1-9]\d{8,10}|
           [2-9]\d{7}
         </nationalNumberPattern>
@@ -12427,8 +12677,9 @@
       <!-- 00798 ITFS numbers can't be dialled internationally. Source:
            https://support.twilio.com/hc/en-us/articles/115007579027-Toll-free-phone-number-restrictions-and-limitations -->
       <noInternationalDialling>
-        <possibleLengths national="10,13"/>
+        <possibleLengths national="10,12,13"/>
         <nationalNumberPattern>
+          001803\d{6,7}|
           (?:
             007803\d|
             8071
@@ -12526,14 +12777,15 @@
         <nationalNumberPattern>8[1-35-9]\d{7,10}</nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="[8-11],13"/>
+        <possibleLengths national="[8-13]"/>
         <exampleNumber>8001234567</exampleNumber>
         <nationalNumberPattern>
-          007803\d{7}|
+          00[17]803\d{7}|
           (?:
             177\d|
             800
-          )\d{5,7}
+          )\d{5,7}|
+          001803\d{6}
         </nationalNumberPattern>
       </tollFree>
       <!-- The information below is provided by an Indonesian -->
@@ -12848,10 +13100,10 @@
             5(?:
               01|
               1[79]|
-              2[2-8]|
-              3[23]|
-              44|
-              5[05689]|
+              2[2-9]|
+              3[0-3]|
+              4[34]|
+              5[015689]|
               6[6-8]|
               7[0-267]|
               8[7-9]|
@@ -12901,11 +13153,14 @@
         <possibleLengths national="9"/>
         <exampleNumber>771234567</exampleNumber>
         <nationalNumberPattern>
-          78(?:
-            33|
-            55|
-            77|
-            81
+          7(?:
+            380|
+            8(?:
+              33|
+              55|
+              77|
+              81
+            )
           )\d{5}|
           7(?:
             18|
@@ -12943,7 +13198,7 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom -->
     <territory id="IM" countryCode="44" leadingDigits="74576|(?:16|7[56])24"
                internationalPrefix="00" nationalPrefix="0"
-               nationalPrefixForParsing="0|([5-8]\d{5})$" nationalPrefixTransformRule="1624$1">
+               nationalPrefixForParsing="0|([25-8]\d{5})$" nationalPrefixTransformRule="1624$1">
       <generalDesc>
         <nationalNumberPattern>
           1624\d{6}|
@@ -12958,7 +13213,12 @@
       <fixedLine>
         <possibleLengths national="10" localOnly="6"/>
         <exampleNumber>1624756789</exampleNumber>
-        <nationalNumberPattern>1624[5-8]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          1624(?:
+            230|
+            [5-8]\d\d
+          )\d{3}
+        </nationalNumberPattern>
       </fixedLine>
       <!-- 7624[0-4689] numbers could be mobile or paging. However, more evidence and example
            numbers show these are mobile in practice. -->
@@ -14342,37 +14602,33 @@
         <possibleLengths national="10"/>
         <exampleNumber>9123456789</exampleNumber>
         <nationalNumberPattern>
+          99(?:
+            5[15]0|
+            888|
+            9(?:
+              0[013]|
+              21|
+              77|
+              88
+            )
+          )\d{5}|
           9(?:
+            0(?:
+              [1-35]\d|
+              4[4-6]
+            )|
             (?:
-              0(?:
-                [1-35]\d|
-                4[4-6]
-              )|
-              (?:
-                [13]\d|
-                2[0-2]
-              )\d
+              [13]\d|
+              2[0-3]
             )\d|
             9(?:
-              (?:
-                [0-2]\d|
-                3[01]|
-                4[45]
-              )\d|
-              5[15]0|
-              8(?:
-                1\d|
-                88
-              )|
-              9(?:
-                0[013]|
-                1\d|
-                21|
-                77|
-                9[6-9]
-              )
+              [0-2]\d|
+              3[01]|
+              4[0145]|
+              81|
+              9[19]
             )
-          )\d{5}
+          )\d{6}
         </nationalNumberPattern>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
@@ -14873,6 +15129,10 @@
         <possibleLengths national="10"/>
         <exampleNumber>7640123456</exampleNumber>
         <nationalNumberPattern>
+          76(?:
+            464|
+            652
+          )\d{5}|
           76(?:
             0[0-2]|
             2[356]|
@@ -15011,6 +15271,7 @@
         <possibleLengths national="10" localOnly="7"/>
         <exampleNumber>8765230123</exampleNumber>
         <nationalNumberPattern>
+          8766060\d{3}|
           (?:
             658(?:
               2(?:
@@ -15121,25 +15382,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -15249,7 +15517,7 @@
               )|
               4(?:
                 0[0-25]|
-                1[2-467]|
+                1[2-7]|
                 2[0569]|
                 [38][07-9]|
                 4[025689]|
@@ -15412,11 +15680,11 @@
             7468|
             8(?:
               3(?:
-                8[78]|
+                8[7-9]|
                 96
               )|
               477|
-              51[24]|
+              51[2-9]|
               636
             )|
             9(?:
@@ -15459,11 +15727,11 @@
             7468|
             8(?:
               3(?:
-                8[78]|
+                8[7-9]|
                 96[2457-9]
               )|
               477|
-              51[24]|
+              51[2-9]|
               636[457-9]
             )|
             9(?:
@@ -15553,8 +15821,9 @@
             )|
             8(?:
               2[124589]|
-              3[279]|
+              3[27-9]|
               49|
+              51|
               6|
               7[0-468]|
               8[68]|
@@ -15589,7 +15858,6 @@
               3[0-269]|
               4[59]|
               5(?:
-                [0468][01]|
                 [1-3]|
                 5[0-69]|
                 9[19]
@@ -15612,7 +15880,6 @@
             4(?:
               2(?:
                 [13-79]|
-                2[01]|
                 8[014-6]
               )|
               3[0-57]|
@@ -15648,6 +15915,7 @@
                 9[0-2469]
               )|
               49|
+              51|
               6(?:
                 [0-24]|
                 36|
@@ -15684,6 +15952,11 @@
               57|
               93
             )[015-9]|
+            (?:
+              25[0468]|
+              422|
+              838
+            )[01]|
             (?:
               47[59]|
               59[89]|
@@ -15709,7 +15982,6 @@
               3[0-269]|
               4[59]|
               5(?:
-                [0468][01]|
                 [1-3]|
                 5[0-69]|
                 9(?:
@@ -15738,7 +16010,6 @@
             4(?:
               2(?:
                 [13-79]|
-                2[01]|
                 8[014-6]
               )|
               3[0-57]|
@@ -15782,6 +16053,7 @@
                 )
               )|
               49|
+              51|
               6(?:
                 [0-24]|
                 36[23]|
@@ -15825,6 +16097,11 @@
               223|
               8699
             )[014-9]|
+            (?:
+              25[0468]|
+              422|
+              838
+            )[01]|
             (?:
               48|
               8292|
@@ -15855,7 +16132,6 @@
               3[0-269]|
               4[59]|
               5(?:
-                [0468][01]|
                 [1-3]|
                 5[0-69]|
                 7[015-9]|
@@ -15886,7 +16162,6 @@
             4(?:
               2(?:
                 [13-79]|
-                2[01]|
                 8[014-6]
               )|
               3[0-57]|
@@ -15937,6 +16212,7 @@
                 )
               )|
               49|
+              51|
               6(?:
                 [0-24]|
                 36[23]|
@@ -15973,6 +16249,11 @@
               223|
               8699
             )[014-9]|
+            (?:
+              25[0468]|
+              422|
+              838
+            )[01]|
             (?:
               48|
               829(?:
@@ -15995,29 +16276,9 @@
         <numberFormat pattern="(\d{3})(\d{2})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
             [14]|
-            [29][2-9]|
-            5[3-9]|
-            7[2-4679]|
-            8(?:
-              [246-9]|
-              3[3-8]|
-              5[2-9]
-            )
-          </leadingDigits>
-          <leadingDigits>
-            [14]|
-            [29][2-9]|
+            [289][2-9]|
             5[3-9]|
-            7[2-4679]|
-            8(?:
-              [246-9]|
-              3(?:
-                [3-6][2-9]|
-                7|
-                8[2-5]
-              )|
-              5[2-9]
-            )
+            7[2-4679]
           </leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
@@ -16036,10 +16297,7 @@
           <format>$1-$2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>
-            [2579]|
-            80
-          </leadingDigits>
+          <leadingDigits>[257-9]</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d{3})(\d{3,4})">
@@ -16276,8 +16534,9 @@
         <nationalNumberPattern>
           (?:
             1(?:
-              0[0-2]|
-              1[0-5]
+              0[0-6]|
+              1[0-5]|
+              2[014]
             )|
             7\d\d
           )\d{6}
@@ -16402,12 +16661,9 @@
         <possibleLengths national="9"/>
         <exampleNumber>700123456</exampleNumber>
         <nationalNumberPattern>
-          (?:
-            312(?:
-              58\d|
-              973
-            )|
-            8801\d\d
+          312(?:
+            58\d|
+            973
           )\d{3}|
           (?:
             2(?:
@@ -16419,6 +16675,7 @@
               [07]\d|
               55
             )|
+            880|
             99[05-9]
           )\d{6}
         </nationalNumberPattern>
@@ -16745,25 +17002,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -17152,6 +17416,7 @@
             )|
             6(?:
               222|
+              333|
               444|
               70[013-9]|
               888|
@@ -17159,7 +17424,10 @@
             )|
             9(?:
               11[01]|
-              333|
+              3(?:
+                00|
+                33
+              )|
               500
             )
           )\d{4}|
@@ -17314,25 +17582,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -17482,7 +17757,7 @@
           7(?:
             0[0-25-8]|
             47|
-            6[02-4]|
+            6[0-4]|
             7[15-8]|
             85
           )\d{7}
@@ -17603,32 +17878,34 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
-          <leadingDigits>[7-9]</leadingDigits>
+          <leadingDigits>[27-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [7-9]\d{7}|
+          [27-9]\d{7}|
           [13-9]\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="7"/>
+        <possibleLengths national="7,8"/>
         <exampleNumber>1123456</exampleNumber>
         <nationalNumberPattern>
+          7(?:
+            62|
+            8[0-7]|
+            9[04-9]
+          )\d{4}|
           (?:
-            (?:
+            [14-69]\d|
+            2(?:
               [14-69]\d|
-              8[02-9]
-            )\d|
-            7(?:
-              [2-57]\d|
-              62|
-              8[0-7]|
-              9[04-9]
-            )
-          )\d{4}
+              [78][1-9]
+            )|
+            7[2-57]|
+            8[02-9]
+          )\d{5}
         </nationalNumberPattern>
       </fixedLine>
       <!-- We only validate the first three digits here, since the ranges are growing rapidly.
@@ -17754,25 +18031,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -17974,7 +18258,12 @@
       <mobile>
         <possibleLengths national="9"/>
         <exampleNumber>712345678</exampleNumber>
-        <nationalNumberPattern>7[0-25-8]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          7(?:
+            [0-25-8]\d|
+            4[01]
+          )\d{6}
+        </nationalNumberPattern>
       </mobile>
       <!-- Prefix 1973 is assigned to SriLankan Airlines in various locations. -->
       <uan>
@@ -18616,9 +18905,9 @@
               8[0-247-9]
             )|
             7(?:
-              0[016-8]|
+              0\d|
               6[1267]|
-              7[0-27]
+              7[0-57]
             )
           )\d{6}
         </nationalNumberPattern>
@@ -18656,7 +18945,7 @@
       <availableFormats>
         <!-- National only fixed line numbers -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{2})">
-          <leadingDigits>8</leadingDigits>
+          <leadingDigits>87</leadingDigits>
           <format>$1 $2 $3</format>
           <intlFormat>NA</intlFormat>
         </numberFormat>
@@ -18671,7 +18960,7 @@
              For the mobile prefix 3, we could not get authoritative information, so following
              the behaviour of fixed-line numbers beginning with 9 for now. -->
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>[39]</leadingDigits>
+          <leadingDigits>[389]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <!-- 9-digit mobile numbers. -->
@@ -18683,16 +18972,15 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          870\d{5}|
           (?:
-            [349]|
+            [3489]|
             6\d
           )\d{7}
         </nationalNumberPattern>
       </generalDesc>
       <noInternationalDialling>
         <possibleLengths national="8"/>
-        <nationalNumberPattern>870\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>8[07]0\d{5}</nationalNumberPattern>
       </noInternationalDialling>
       <!-- Restricted to this as no numbers with the prefix of 91, 95 or 96 have been found. -->
       <fixedLine>
@@ -18723,7 +19011,12 @@
       <tollFree>
         <possibleLengths national="8"/>
         <exampleNumber>90123456</exampleNumber>
-        <nationalNumberPattern>90\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            800|
+            90\d
+          )\d{5}
+        </nationalNumberPattern>
       </tollFree>
     </territory>
 
@@ -19134,6 +19427,7 @@
         <exampleNumber>72345678</exampleNumber>
         <nationalNumberPattern>
           7(?:
+            3555|
             4(?:
               60\d|
               747
@@ -19789,6 +20083,7 @@
         <possibleLengths national="8"/>
         <exampleNumber>66123456</exampleNumber>
         <nationalNumberPattern>
+          6800[0-79]\d{3}|
           6(?:
             [235]\d\d|
             6(?:
@@ -19796,9 +20091,10 @@
               [1-9]\d
             )|
             8(?:
-              [02][5-9]|
-              [146-8]\d|
-              [35][0-4]
+              0[1-9]|
+              [14-8]\d|
+              2[5-9]|
+              [39][0-4]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -19913,25 +20209,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -19973,14 +20276,13 @@
         <exampleNumber>596301234</exampleNumber>
         <nationalNumberPattern>
           596(?:
-            0[0-7]|
+            0[0-8]|
             10|
             2[7-9]|
-            3[05-9]|
-            4[0-46-8]|
-            [5-7]\d|
+            3[04-9]|
+            [4-7]\d|
             8[09]|
-            9[4-8]
+            9[4-9]
           )\d{4}
         </nationalNumberPattern>
       </fixedLine>
@@ -19992,9 +20294,8 @@
         <nationalNumberPattern>
           69(?:
             6(?:
-              [0-47-9]\d|
-              5[0-6]|
-              6[0-4]
+              [0-46-9]\d|
+              5[0-6]
             )|
             727
           )\d{4}
@@ -20005,7 +20306,7 @@
         <exampleNumber>976612345</exampleNumber>
         <nationalNumberPattern>
           976(?:
-            6[1-9]|
+            6\d|
             7[0-367]
           )\d{4}
         </nationalNumberPattern>
@@ -20120,25 +20421,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -20316,9 +20624,9 @@
             87[15-8]
           )\d{4}|
           5(?:
-            2[589]|
+            2[5-9]|
             4[3-589]|
-            7\d|
+            [57]\d|
             8[0-689]|
             9[0-8]
           )\d{5}
@@ -20926,8 +21234,9 @@
                 [1-9]\d
               )|
               7(?:
-                [01]\d|
-                2[2-6]
+                [0134]\d|
+                2[1-9]|
+                5[0-6]
               )
             )|
             (?:
@@ -21460,7 +21769,10 @@
               0[2-9]|
               1[0-8]
             )|
-            90[1-9]
+            9(?:
+              0[1-9]|
+              1[235]
+            )
           )\d{7}
         </nationalNumberPattern>
       </mobile>
@@ -21741,7 +22053,7 @@
         <numberFormat pattern="(\d{3})(\d{2})(\d{3})">
           <leadingDigits>
             [489]|
-            5[89]
+            59
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -21780,7 +22092,7 @@
         <nationalNumberPattern>
           (?:
             4[015-8]|
-            5[89]|
+            59|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -21852,7 +22164,8 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{6})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            [1-8]|
+            1[01]|
+            [2-8]|
             9(?:
               [1-579]|
               6[2-6]
@@ -21864,10 +22177,19 @@
           <leadingDigits>9</leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
+        <!-- 11 digit toll free number -->
+        <numberFormat pattern="(\d{4})(\d{2})(\d{5})">
+          <leadingDigits>1</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          9\d{9}|
+          (?:
+            1\d|
+            9
+          )\d{9}|
           [1-9]\d{7}
         </nationalNumberPattern>
       </generalDesc>
@@ -21905,6 +22227,18 @@
           )\d{7}
         </nationalNumberPattern>
       </mobile>
+      <!-- Added prefix 166001 based on https://ntc.net.np/post/toll-free-phone.
+           Prefix 1800 is added based on user report. -->
+      <tollFree>
+        <possibleLengths national="11"/>
+        <exampleNumber>16600101234</exampleNumber>
+        <nationalNumberPattern>
+          1(?:
+            66001|
+            800\d\d
+          )\d{5}
+        </nationalNumberPattern>
+      </tollFree>
     </territory>
 
     <!-- Nauru (NR) -->
@@ -21987,13 +22321,20 @@
       <availableFormats>
         <!-- Enhanced voice services -->
         <numberFormat pattern="(\d{2})(\d{3,8})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>83</leadingDigits>
+          <leadingDigits>8[1-579]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <!-- 7, 8-digit variable cost (premium rate/toll free). -->
         <numberFormat pattern="(\d{3})(\d{2})(\d{2,3})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            50[0367]|
+            50[036-8]|
+            [89]0
+          </leadingDigits>
+          <leadingDigits>
+            50(?:
+              [0367]|
+              88
+            )|
             [89]0
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -22112,7 +22453,8 @@
               0[08]|
               30|
               66|
-              77
+              77|
+              88
             )
           )\d{3}|
           90\d{6,8}
@@ -22126,7 +22468,17 @@
       <uan>
         <possibleLengths national="[5-10]"/>
         <exampleNumber>83012378</exampleNumber>
-        <nationalNumberPattern>83\d{3,8}</nationalNumberPattern>
+        <nationalNumberPattern>
+          8(?:
+            1[6-9]|
+            22|
+            3\d|
+            4[045]|
+            5[459]|
+            7[0-3579]|
+            90
+          )\d{2,7}
+        </nationalNumberPattern>
       </uan>
     </territory>
 
@@ -22154,7 +22506,7 @@
             [279]\d{3}|
             500
           )\d{4}|
-          8007\d{4,5}
+          800\d{5,6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -22181,13 +22533,17 @@
            the customer help line for the main telephony company there (omantel), is 8007 followed
            by 5 digits, so am allowing both for now to be on the safe side. 500 numbers seem to
            offer international toll-free dialing numbers - +968 500 1300 for international help
-           desk for omantel, for example. -->
+           desk for omantel, for example. Toll-free numbers 800[05] are added based on user report
+           and not official docs. -->
       <tollFree>
         <possibleLengths national="[7-9]"/>
         <exampleNumber>80071234</exampleNumber>
         <nationalNumberPattern>
-          500\d{4}|
-          8007\d{4,5}
+          8007\d{4,5}|
+          (?:
+            500|
+            800[05]
+          )\d{4}
         </nationalNumberPattern>
       </tollFree>
       <premiumRate>
@@ -22209,16 +22565,19 @@
           <format>$1-$2</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d{4})">
-          <leadingDigits>6</leadingDigits>
+          <leadingDigits>[68]</leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
+          <leadingDigits>8</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            [1-57-9]|
-            6\d
-          )\d{6}
+          8\d{9}|
+          [68]\d{7}|
+          [1-57-9]\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <!-- Note that numbers starting with 101, 106, 131, 151, 156 and 168 have not been assigned to
@@ -22317,7 +22676,7 @@
             21[89]|
             6(?:
               [02-9]\d|
-              1[0-6]
+              1[0-7]
             )\d|
             8(?:
               1[01]|
@@ -22327,9 +22686,15 @@
         </nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="7"/>
+        <possibleLengths national="7,8,10"/>
         <exampleNumber>8001234</exampleNumber>
-        <nationalNumberPattern>800\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>
+          800\d{4}(?:
+            \d(?:
+              \d{2}
+            )?
+          )?
+        </nationalNumberPattern>
       </tollFree>
       <!-- Value-added services are represented as "400" in the plan. -->
       <premiumRate>
@@ -22563,7 +22928,7 @@
           )\d{4}|
           (?:
             7[0-689]|
-            81
+            8[18]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -22783,7 +23148,7 @@
                mobileNumberPortableRegion="true">
       <availableFormats>
         <!-- Toll-free and premium-rate numbers. -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
+        <numberFormat pattern="(\d{3})(\d{3})(\d{2,7})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[89]0</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -22991,10 +23356,15 @@
           )\d{7}
         </nationalNumberPattern>
       </mobile>
+      <!-- Prefix 800 (11 digits) added based on user report. -->
       <tollFree>
-        <possibleLengths national="8"/>
+        <possibleLengths national="8,11"/>
         <exampleNumber>80012345</exampleNumber>
-        <nationalNumberPattern>800\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          800\d{5}(?:
+            \d{3}
+          )?
+        </nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="8"/>
@@ -23339,25 +23709,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -23606,13 +23983,14 @@
         <exampleNumber>6201234</exampleNumber>
         <nationalNumberPattern>
           (?:
-            45[0-5]|
-            6[2-4689]0|
-            (?:
-              77|
-              88
-            )\d
-          )\d{4}
+            46[0-5]|
+            6[2-4689]0
+          )\d{4}|
+          (?:
+            45|
+            77|
+            88
+          )\d{5}
         </nationalNumberPattern>
       </mobile>
     </territory>
@@ -23677,19 +24055,30 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{6})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>9</leadingDigits>
+          <leadingDigits>
+            9(?:
+              [5-79]|
+              8[1-6]
+            )
+          </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[2-8]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- 11 digit toll free numbers -->
+        <numberFormat pattern="(\d{4})(\d{3})(\d{4})">
+          <leadingDigits>9</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           59\d{4,6}|
+          9\d{5,10}|
           (?:
-            [2-46-9]\d|
+            [2-46-8]\d|
             5[0-8]
           )\d{4,7}
         </nationalNumberPattern>
@@ -23756,6 +24145,11 @@
           )\d{6}
         </nationalNumberPattern>
       </mobile>
+      <tollFree>
+        <possibleLengths national="[9-11]"/>
+        <exampleNumber>98000123456</exampleNumber>
+        <nationalNumberPattern>9800\d{5,7}</nationalNumberPattern>
+      </tollFree>
       <voip>
         <possibleLengths national="9"/>
         <exampleNumber>870012345</exampleNumber>
@@ -23861,7 +24255,7 @@
         <nationalNumberPattern>
           26(?:
             2\d\d|
-            30[01]
+            30[0-5]
           )\d{4}
         </nationalNumberPattern>
       </fixedLine>
@@ -23878,7 +24272,7 @@
                 2[0-2]|
                 3[0-39]|
                 4\d|
-                5[05]|
+                5[0-5]|
                 6[0-36]|
                 7[0-27]|
                 8[0-8]|
@@ -24439,6 +24833,7 @@
         <possibleLengths national="9"/>
         <exampleNumber>512345678</exampleNumber>
         <nationalNumberPattern>
+          579[01]\d{5}|
           5(?:
             [013-689]\d|
             7[0-36-8]
@@ -24964,7 +25359,7 @@
           <leadingDigits>
             [369]|
             8(?:
-              0[13]|
+              0[1-3]|
               [1-9]
             )
           </leadingDigits>
@@ -25014,13 +25409,13 @@
           (?:
             8(?:
               0(?:
-                1[0-7]|
-                3[01]
+                1\d|
+                2[014-9]|
+                3[0-7]
               )|
               [1-8]\d\d|
               9(?:
-                [0-24]\d|
-                3[0-489]|
+                [0-4]\d|
                 5[0-2]
               )
             )|
@@ -25228,8 +25623,8 @@
         <nationalNumberPattern>
           0\d{4}|
           (?:
-            [4589]\d|
-            79
+            [489]\d|
+            [57]9
           )\d{6}
         </nationalNumberPattern>
       </generalDesc>
@@ -25245,7 +25640,7 @@
         <nationalNumberPattern>
           (?:
             4[015-8]|
-            5[89]|
+            59|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -25476,9 +25871,9 @@
         <nationalNumberPattern>
           (?:
             25|
-            3[013-5]|
+            3[0-5]|
             66|
-            7[4-9]|
+            7[3-9]|
             8[08]|
             99
           )\d{6}
@@ -25600,6 +25995,7 @@
           7(?:
             [06-8]\d|
             21|
+            5[4-7]|
             90
           )\d{6}
         </nationalNumberPattern>
@@ -26020,25 +26416,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -26248,25 +26651,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -26432,6 +26842,7 @@
         <possibleLengths national="9"/>
         <exampleNumber>812345678</exampleNumber>
         <nationalNumberPattern>
+          671[0-3]\d{5}|
           (?:
             14|
             6[1-6]|
@@ -26478,12 +26889,12 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d)(\d{4})" nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>3</leadingDigits>
+          <leadingDigits>3[1-5]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})" nationalPrefixOptionalWhenFormatting="true">
           <leadingDigits>
-            [0457-9]|
+            [02-57-9]|
             11
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -26492,7 +26903,7 @@
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            00|
+            [02]0|
             11|
             [3-57-9]\d
           )\d{7}
@@ -26528,20 +26939,15 @@
         <nationalNumberPattern>
           41[18]\d{6}|
           (?:
-            [04]0|
+            [02-4]0|
             11|
             5[05]|
             7[07]|
-            88|
+            8[08]|
             9\d
           )\d{7}
         </nationalNumberPattern>
       </mobile>
-      <tollFree>
-        <possibleLengths national="9"/>
-        <exampleNumber>800123456</exampleNumber>
-        <nationalNumberPattern>800\d{6}</nationalNumberPattern>
-      </tollFree>
     </territory>
 
     <!-- Tokelau (TK) -->
@@ -26802,7 +27208,7 @@
         </numberFormat>
         <!-- Format for mobile and premium rate numbers. -->
         <numberFormat pattern="(\d{3})(\d{4})">
-          <leadingDigits>[5-8]</leadingDigits>
+          <leadingDigits>[5-9]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
@@ -26810,7 +27216,10 @@
         <nationalNumberPattern>
           (?:
             0800|
-            [5-8]\d{3}
+            (?:
+              [5-8]\d\d|
+              999
+            )\d
           )\d{3}|
           [2-8]\d{4}
         </nationalNumberPattern>
@@ -26836,15 +27245,18 @@
         <possibleLengths national="7"/>
         <exampleNumber>7715123</exampleNumber>
         <nationalNumberPattern>
-          6(?:
-            3[02]|
-            8[5-9]
-          )\d{4}|
           (?:
-            6[09]|
-            7\d|
-            8[46-9]
-          )\d{5}
+            6(?:
+              [09]\d|
+              3[02]|
+              8[15-9]
+            )|
+            (?:
+              7\d|
+              8[46-9]
+            )\d|
+            999
+          )\d{4}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -26878,7 +27290,7 @@
                       nationalPrefixOptionalWhenFormatting="true">
           <leadingDigits>
             512|
-            8[0589]|
+            8[01589]|
             90
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -26935,8 +27347,13 @@
         </nationalNumberPattern>
       </generalDesc>
       <noInternationalDialling>
-        <possibleLengths national="7"/>
-        <nationalNumberPattern>444\d{4}</nationalNumberPattern>
+        <possibleLengths national="7,10"/>
+        <nationalNumberPattern>
+          (?:
+            444|
+            811\d{3}
+          )\d{4}
+        </nationalNumberPattern>
       </noInternationalDialling>
       <!-- Includes numbers starting with 392 for Northern Cyprus. Not supporting additionally
            allocated area codes that are mentioned in ITU doc dated 7.VII.2009 as these are not
@@ -26991,14 +27408,18 @@
         <exampleNumber>5123456789</exampleNumber>
         <nationalNumberPattern>512\d{7}</nationalNumberPattern>
       </pager>
-      <!-- Toll free range 800 of length 13 digits supported based on user report. -->
+      <!-- Toll free range 800 of length 13 digits and 811 of length 10 digits are supported based
+           on user report. -->
       <tollFree>
         <possibleLengths national="10,12,13"/>
         <exampleNumber>8001234567</exampleNumber>
         <nationalNumberPattern>
-          800\d{7}(?:
-            \d{2,3}
-          )?
+          8(?:
+            00\d{7}(?:
+              \d{2,3}
+            )?|
+            11\d{7}
+          )
         </nationalNumberPattern>
       </tollFree>
       <premiumRate>
@@ -27086,14 +27507,14 @@
         <exampleNumber>8682911234</exampleNumber>
         <nationalNumberPattern>
           868(?:
-            2(?:
-              6[3-9]|
-              [7-9]\d
-            )|
             (?:
-              3\d|
-              4[6-9]
+              2[5-9]|
+              3\d
             )\d|
+            4(?:
+              3[0-6]|
+              [6-9]\d
+            )|
             6(?:
               20|
               78|
@@ -27133,25 +27554,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -27486,8 +27914,8 @@
         <nationalNumberPattern>
           77[2-9]\d{6}|
           (?:
-            6[2-9]|
-            7[13-689]
+            6[1-9]|
+            7[1-689]
           )\d{7}
         </nationalNumberPattern>
       </mobile>
@@ -27833,7 +28261,7 @@
               1[02-579]|
               2[3-5]|
               3[0245]|
-              4[0235]|
+              4[02357]|
               58|
               6[39]|
               7[0589]|
@@ -27876,7 +28304,7 @@
               1[02-8]|
               2[08]|
               3[0-289]|
-              4[3578]|
+              4[03578]|
               5[046-9]|
               6[02-5]|
               7[028]
@@ -27886,7 +28314,7 @@
               1[02-9]|
               2[0589]|
               3[0146-8]|
-              4[0179]|
+              4[01579]|
               5[12469]|
               7[0-389]|
               8[04-69]
@@ -27925,7 +28353,7 @@
               1[02-579]|
               2[3-5]|
               3[0245]|
-              4[0235]|
+              4[02357]|
               58|
               6[39]|
               7[0589]|
@@ -27968,7 +28396,7 @@
               1[02-8]|
               2[08]|
               3[0-289]|
-              4[3578]|
+              4[03578]|
               5[046-9]|
               6[02-5]|
               7[028]
@@ -27978,7 +28406,7 @@
               1[02-9]|
               2[0589]|
               3[0146-8]|
-              4[0179]|
+              4[01579]|
               5[12469]|
               7[0-389]|
               8[04-69]
@@ -28012,25 +28440,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -28055,6 +28490,7 @@
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
+            405|
             8|
             90
           </leadingDigits>
@@ -28070,14 +28506,20 @@
           <leadingDigits>[24]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- 10 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>4</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          4\d{9}|
+          [249]\d{7}|
           (?:
-            [249]\d\d|
+            [49]\d|
             80
-          )\d{5}|
-          9\d{6}
+          )\d{5}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -28096,9 +28538,15 @@
         <nationalNumberPattern>9[1-9]\d{6}</nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="7"/>
+        <possibleLengths national="7,10"/>
         <exampleNumber>8001234</exampleNumber>
-        <nationalNumberPattern>80[05]\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            4\d{5}|
+            80[05]
+          )\d{4}|
+          405\d{4}
+        </nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="7"/>
@@ -28115,7 +28563,7 @@
                internationalPrefix="810" nationalPrefix="8">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP $FG">
-          <leadingDigits>[5-9]</leadingDigits>
+          <leadingDigits>[35-9]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -28123,6 +28571,7 @@
         <nationalNumberPattern>
           55501\d{4}|
           (?:
+            33|
             [679]\d|
             88
           )\d{7}
@@ -28219,6 +28668,11 @@
         <exampleNumber>912345678</exampleNumber>
         <nationalNumberPattern>
           (?:
+            (?:
+              33|
+              88|
+              9[0-57-9]
+            )\d{3}|
             55501|
             6(?:
               1(?:
@@ -28467,11 +28921,7 @@
                   9[07]
                 )
               )
-            )|
-            (?:
-              88|
-              9[0-57-9]
-            )\d{3}
+            )
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -28680,25 +29130,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -28870,25 +29327,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -29028,25 +29492,32 @@
         <exampleNumber>5002345678</exampleNumber>
         <nationalNumberPattern>
           52(?:
-            35(?:
-              [02-46-9]\d|
-              1[02-9]|
-              5[0-46-9]
+            3(?:
+              [2-46-9][02-9]\d|
+              5(?:
+                [02-46-9]\d|
+                5[0-46-9]
+              )
             )|
-            45(?:
-              [034]\d|
-              1[02-9]|
-              2[024-9]|
-              5[0-46-9]
+            4(?:
+              [2-478][02-9]\d|
+              5(?:
+                [034]\d|
+                2[024-9]|
+                5[0-46-9]
+              )|
+              6(?:
+                0[1-9]|
+                [2-9]\d
+              )|
+              9(?:
+                [05-9]\d|
+                2[0-5]|
+                49
+              )
             )
           )\d{4}|
-          52(?:
-            3[2-46-9]|
-            4[2-4]
-          )(?:
-            [02-9]\d|
-            1[02-9]
-          )\d{4}|
+          52[34][2-9]1[02-9]\d{4}|
           5(?:
             00|
             2[12]|
@@ -29179,16 +29650,16 @@
       <!-- As per the user and update from carrier it seems that numbers starting with 1800 are
            renumbered to 1228. Because we don't have complete update,supporting both the ranges
            at present.
-           Prefix 1203 is toll free number and is diallable from Orange Business Services based on
-           user report. As we do not have official document mentioning the cost of the range, we
-           have added it here for now. -->
+           Prefix 120[13] is toll free number and is diallable from Orange Business Services based
+           on user report. As we do not have official document mentioning the cost of the range,
+           we have added it here for now. -->
       <tollFree>
         <possibleLengths national="[8-10]"/>
         <exampleNumber>1800123456</exampleNumber>
         <nationalNumberPattern>
           1800\d{4,6}|
           12(?:
-            03|
+            0[13]|
             28
           )\d{4}
         </nationalNumberPattern>
@@ -29232,14 +29703,11 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          [48]8\d{3}|
           (?:
-            [23]\d|
-            [48]8
-          )\d{3}|
-          (?:
-            [57]\d|
-            90
-          )\d{5}
+            [23]|
+            [579]\d\d
+          )\d{4}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -29270,7 +29738,12 @@
       <voip>
         <possibleLengths national="7"/>
         <exampleNumber>9010123</exampleNumber>
-        <nationalNumberPattern>90[1-9]\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            0[1-9]|
+            1[01]
+          )\d{4}
+        </nationalNumberPattern>
       </voip>
       <!-- Using this for non-geographical numbers, since they have not been clearly defined, and
            for government fixed-line numbers. -->
@@ -29385,7 +29858,7 @@
         <exampleNumber>7212345</exampleNumber>
         <nationalNumberPattern>
           (?:
-            7[235-7]|
+            7[1-35-7]|
             8(?:
               [3-7]|
               9\d{3}
@@ -29533,7 +30006,7 @@
         <nationalNumberPattern>
           269(?:
             0[67]|
-            5[0-2]|
+            5[0-3]|
             6\d|
             [78]0
           )\d{4}
@@ -30218,17 +30691,21 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[35-7]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>
+          7\d{11}|
+          [35-7]\d{8}
+        </nationalNumberPattern>
       </generalDesc>
       <!-- Assigning these to mobile since Inmarsat considers them to be mobile numbers. -->
       <mobile>
-        <possibleLengths national="9"/>
+        <possibleLengths national="9,12"/>
         <exampleNumber>301234567</exampleNumber>
         <nationalNumberPattern>
           (?:
-            [356]\d|
-            7[6-8]
-          )\d{7}
+            [356]|
+            774[45]
+          )\d{8}|
+          7[6-8]\d{7}
         </nationalNumberPattern>
       </mobile>
     </territory>
@@ -30294,7 +30771,7 @@
     <!-- http://www.itu.int/oth/T02020000CF/en -->
     <territory id="001" countryCode="882">
       <availableFormats>
-        <!-- For 7 digit numbers in general. -->
+        <!-- For 7 digit numbers in general -->
         <numberFormat pattern="(\d{2})(\d{5})">
           <leadingDigits>
             16|
@@ -30302,6 +30779,11 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- For 8 digit mobile numbers. -->
+        <numberFormat pattern="(\d{2})(\d{6})">
+          <leadingDigits>4</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <!-- For 8 digit VOIP numbers. -->
         <numberFormat pattern="(\d{2})(\d{2})(\d{4})">
           <leadingDigits>[19]</leadingDigits>
@@ -30339,20 +30821,24 @@
             \d{2,5}
           )?|
           285\d{9}|
-          [19]\d{7}
+          (?:
+            [19]\d|
+            49
+          )\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <!-- Bebbicell Mobile numbers, MCP and Oration. We are guessing the number length for
            Oration based on numbers found online. AT&T have confirmed that 37X numbers
            are 12 digit MSISDN numbers. -->
       <mobile>
-        <possibleLengths national="7,9,10,12"/>
+        <possibleLengths national="[7-10],12"/>
         <exampleNumber>3421234</exampleNumber>
         <nationalNumberPattern>
-          3(?:
-            37\d\d|
-            42
-          )\d{4}|
+          342\d{4}|
+          (?:
+            337|
+            49
+          )\d{6}|
           3(?:
             2|
             47|