From baf32c6953dbc2dd1e0b4ed6996b5f120cabc828 Mon Sep 17 00:00:00 2001
From: jspv <jspvgithub@twinleaf.xyz>
Date: Sun, 4 Feb 2018 10:45:57 -0500
Subject: [PATCH] Fix errors (#22)

* Fixed formatting - missing newlines and a few small indent changes

* Normalized key sort for easier future diffs, fixed a few x to times

* Fix errors identifed while processing reprints
---
 json/cards/Ancient Origins.json              | 280 ++++-----
 json/cards/Aquapolis.json                    | 549 ++++++++--------
 json/cards/Arceus.json                       | 314 +++++-----
 json/cards/BREAKpoint.json                   | 330 +++++-----
 json/cards/BREAKthrough.json                 | 414 ++++++-------
 json/cards/BW Black Star Promos.json         | 374 ++++++-----
 json/cards/Base Set 2.json                   | 290 ++++-----
 json/cards/Base.json                         | 196 +++---
 json/cards/Black & White.json                | 274 ++++----
 json/cards/Boundaries Crossed.json           | 450 +++++++-------
 json/cards/Call of Legends.json              | 294 ++++-----
 json/cards/Crystal Guardians.json            | 242 ++++----
 json/cards/Dark Explorers.json               | 332 +++++-----
 json/cards/Delta Species.json                | 324 +++++-----
 json/cards/Deoxys.json                       | 310 ++++-----
 json/cards/Diamond & Pearl.json              | 340 +++++-----
 json/cards/Double Crisis.json                |  68 +-
 json/cards/Dragon Frontiers.json             | 240 +++----
 json/cards/Dragon Vault.json                 |  48 +-
 json/cards/Dragon.json                       | 262 ++++----
 json/cards/Dragons Exalted.json              | 410 ++++++------
 json/cards/Emerald.json                      | 262 ++++----
 json/cards/Emerging Powers.json              | 276 ++++-----
 json/cards/Evolutions.json                   | 230 +++----
 json/cards/Expedition Base Set.json          | 536 ++++++++--------
 json/cards/Fates Collide.json                | 314 +++++-----
 json/cards/FireRed & LeafGreen.json          | 284 ++++-----
 json/cards/Flashfire.json                    | 296 ++++-----
 json/cards/Fossil.json                       | 193 +++---
 json/cards/Furious Fists.json                | 302 ++++-----
 json/cards/Generations.json                  | 280 ++++-----
 json/cards/Great Encounters.json             | 338 +++++-----
 json/cards/Guardians Rising.json             |  12 +-
 json/cards/Gym Challenge.json                | 262 ++++----
 json/cards/Gym Heroes.json                   | 232 +++----
 "json/cards/HS\342\200\224Triumphant.json"   | 296 ++++-----
 "json/cards/HS\342\200\224Undaunted.json"    | 260 ++++----
 "json/cards/HS\342\200\224Unleashed.json"    | 276 ++++-----
 json/cards/HeartGold & SoulSilver.json       | 350 ++++++-----
 json/cards/Hidden Legends.json               | 310 ++++-----
 json/cards/Holon Phantoms.json               | 308 ++++-----
 json/cards/Jungle.json                       | 208 +++----
 json/cards/Kalos Starter Set.json            |  88 +--
 json/cards/Legend Maker.json                 | 256 ++++----
 json/cards/Legendary Collection.json         | 435 ++++++-------
 json/cards/Legendary Treasures.json          | 470 +++++++-------
 json/cards/Legends Awakened.json             | 466 +++++++-------
 json/cards/Majestic Dawn.json                | 272 ++++----
 json/cards/Mysterious Treasures.json         | 358 +++++------
 json/cards/Neo Destiny.json                  | 316 +++++-----
 json/cards/Neo Discovery.json                | 244 ++++----
 json/cards/Neo Genesis.json                  | 262 ++++----
 json/cards/Neo Revelation.json               | 212 +++----
 json/cards/Next Destinies.json               | 310 ++++-----
 json/cards/Noble Victories.json              | 328 +++++-----
 json/cards/POP Series 1.json                 |  66 +-
 json/cards/POP Series 2.json                 |  46 +-
 json/cards/POP Series 3.json                 |  56 +-
 json/cards/POP Series 4.json                 |  49 +-
 json/cards/POP Series 5.json                 |  38 +-
 json/cards/POP Series 6.json                 |  86 +--
 json/cards/POP Series 7.json                 | 110 ++--
 json/cards/POP Series 8.json                 |  64 +-
 json/cards/POP Series 9.json                 |  50 +-
 json/cards/Phantom Forces.json               | 324 +++++-----
 json/cards/Plasma Blast.json                 | 296 ++++-----
 json/cards/Plasma Freeze.json                | 372 +++++------
 json/cards/Plasma Storm.json                 | 418 ++++++-------
 json/cards/Platinum.json                     | 366 +++++------
 json/cards/Power Keepers.json                | 266 ++++----
 json/cards/Primal Clash.json                 | 448 ++++++-------
 json/cards/Rising Rivals.json                | 362 +++++------
 json/cards/Roaring Skies.json                | 292 ++++-----
 json/cards/Ruby & Sapphire.json              | 270 ++++----
 json/cards/Sandstorm.json                    | 296 ++++-----
 json/cards/Secret Wonders.json               | 386 ++++++------
 json/cards/Skyridge.json                     | 508 +++++++--------
 json/cards/Steam Siege.json                  | 422 ++++++-------
 json/cards/Stormfront.json                   | 296 ++++-----
 json/cards/Sun & Moon Black Star Promos.json |  14 +-
 json/cards/Sun & Moon.json                   | 408 ++++++------
 json/cards/Supreme Victors.json              | 498 +++++++--------
 json/cards/Team Magma vs Team Aqua.json      | 238 +++----
 json/cards/Team Rocket Returns.json          | 294 ++++-----
 json/cards/Team Rocket.json                  | 221 +++----
 json/cards/Ultra Prism.json                  |  14 +-
 json/cards/Unseen Forces.json                | 420 ++++++-------
 json/cards/Wizards Black Star Promos.json    | 169 +++--
 json/cards/XY Black Star Promos.json         | 621 ++++++++++---------
 json/cards/XY.json                           | 408 ++++++------
 90 files changed, 12737 insertions(+), 12638 deletions(-)

diff --git a/json/cards/Ancient Origins.json b/json/cards/Ancient Origins.json
index 494fe98a9..ffecb5717 100644
--- a/json/cards/Ancient Origins.json	
+++ b/json/cards/Ancient Origins.json	
@@ -35,8 +35,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/1_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -79,8 +79,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/2_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -132,8 +132,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/3_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "xy7-4",
@@ -182,8 +182,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/4_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "xy7-5",
@@ -221,8 +221,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/5_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -270,8 +270,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/6_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "xy7-7",
@@ -322,8 +322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/7_hires.png",
+    "nationalPokedexNumber": 254,
     "evolvesTo": "M Sceptile-EX"
   },
   {
@@ -370,8 +370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/8_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "xy7-9",
@@ -409,8 +409,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/9_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -459,8 +459,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/10_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "xy7-11",
@@ -512,8 +512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/11_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "xy7-12",
@@ -561,8 +561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/12_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "xy7-13",
@@ -608,8 +608,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/13_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "xy7-14",
@@ -658,8 +658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/14_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "xy7-15",
@@ -714,8 +714,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/15_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "xy7-16",
@@ -755,8 +755,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/16_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -808,8 +808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/17_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "xy7-18",
@@ -863,8 +863,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/18_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "xy7-19",
@@ -902,8 +902,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/19_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -961,8 +961,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/20_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xy7-21",
@@ -971,6 +971,10 @@
     "subtype": "Stage 1",
     "supertype": "Pokémon",
     "evolvesFrom": "Magikarp",
+    "ancientTrait": {
+      "name": "θ Double",
+      "text": "This Pokémon may have up to 2 Pokémon Tool cards attached to it."
+    },
     "hp": "130",
     "retreatCost": [
       "Colorless",
@@ -983,9 +987,7 @@
     "series": "XY",
     "set": "Ancient Origins",
     "setCode": "xy7",
-    "text": [
-      "This Pokémon may have up to 2 Pokémon Tool cards attached to it."
-    ],
+    "text": "",
     "types": [
       "Water"
     ],
@@ -1019,8 +1021,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/21_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xy7-22",
@@ -1067,8 +1069,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/22_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "xy7-23",
@@ -1116,8 +1118,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/23_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "xy7-24",
@@ -1169,8 +1171,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 378,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/24_hires.png",
+    "nationalPokedexNumber": 378
   },
   {
     "id": "xy7-25",
@@ -1227,8 +1229,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/25_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "xy7-26",
@@ -1277,8 +1279,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/26_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "xy7-27",
@@ -1338,8 +1340,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/27_hires.png",
+    "nationalPokedexNumber": 181,
     "evolvesTo": "M Ampharos-EX"
   },
   {
@@ -1394,8 +1396,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/28_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "xy7-29",
@@ -1449,8 +1451,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/29_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "xy7-30",
@@ -1493,8 +1495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/30_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "xy7-31",
@@ -1542,8 +1544,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/31_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -1587,8 +1589,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/32_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -1641,8 +1643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/33_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "xy7-34",
@@ -1689,8 +1691,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 622,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/34_hires.png",
+    "nationalPokedexNumber": 622,
     "evolvesTo": [
       "Golurk"
     ]
@@ -1752,8 +1754,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/35_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "xy7-36",
@@ -1802,8 +1804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/36_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xy7-37",
@@ -1858,8 +1860,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/37_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xy7-38",
@@ -1908,8 +1910,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/38_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -1965,8 +1967,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/39_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "xy7-40",
@@ -2018,8 +2020,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/40_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "xy7-41",
@@ -2073,8 +2075,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/41_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "xy7-42",
@@ -2138,8 +2140,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/42_hires.png",
+    "nationalPokedexNumber": 248,
     "evolvesTo": "M Tyranitar-EX"
   },
   {
@@ -2196,8 +2198,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/43_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "xy7-44",
@@ -2239,8 +2241,8 @@
         "text": "Put 3 damage counters on your opponent's Active Pokémon."
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/44_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "xy7-45",
@@ -2284,8 +2286,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 686,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/45_hires.png",
+    "nationalPokedexNumber": 686,
     "evolvesTo": [
       "Malamar"
     ]
@@ -2342,8 +2344,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 687,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/46_hires.png",
+    "nationalPokedexNumber": 687
   },
   {
     "id": "xy7-47",
@@ -2399,8 +2401,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/47_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2462,8 +2464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/48_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -2522,8 +2524,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/49_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "xy7-50",
@@ -2587,8 +2589,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/50_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "xy7-51",
@@ -2646,8 +2648,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/51_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "xy7-52",
@@ -2701,8 +2703,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/52_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -2761,8 +2763,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/53_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -2819,8 +2821,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/54_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "xy7-55",
@@ -2864,8 +2866,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 546,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/55_hires.png",
+    "nationalPokedexNumber": 546,
     "evolvesTo": [
       "Whimsicott"
     ]
@@ -2923,8 +2925,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 547,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/56_hires.png",
+    "nationalPokedexNumber": 547
   },
   {
     "id": "xy7-57",
@@ -2975,8 +2977,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/57_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "xy7-58",
@@ -3021,8 +3023,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 704,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/58_hires.png",
+    "nationalPokedexNumber": 704,
     "evolvesTo": [
       "Sliggoo"
     ]
@@ -3076,8 +3078,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 705,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/59_hires.png",
+    "nationalPokedexNumber": 705,
     "evolvesTo": [
       "Goodra"
     ]
@@ -3134,8 +3136,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 706,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/60_hires.png",
+    "nationalPokedexNumber": 706
   },
   {
     "id": "xy7-61",
@@ -3173,8 +3175,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/61_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3226,8 +3228,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/62_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "xy7-63",
@@ -3275,8 +3277,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/63_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3334,8 +3336,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/64_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -3389,8 +3391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/65_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -3444,8 +3446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/66_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "xy7-67",
@@ -3498,8 +3500,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/67_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "xy7-68",
@@ -3560,8 +3562,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/68_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "xy7-69",
@@ -3884,8 +3886,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/84_hires.png",
+    "nationalPokedexNumber": 254,
     "evolvesTo": "M Sceptile-EX"
   },
   {
@@ -3932,8 +3934,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/85_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "xy7-86",
@@ -3990,8 +3992,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/86_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "xy7-87",
@@ -4051,8 +4053,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/87_hires.png",
+    "nationalPokedexNumber": 181,
     "evolvesTo": "M Ampharos-EX"
   },
   {
@@ -4107,8 +4109,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/88_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "xy7-89",
@@ -4157,8 +4159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/89_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xy7-90",
@@ -4213,8 +4215,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/90_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xy7-91",
@@ -4278,8 +4280,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy7/91_hires.png",
+    "nationalPokedexNumber": 248,
     "evolvesTo": "M Tyranitar-EX"
   },
   {
@@ -4336,8 +4338,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/92_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "xy7-93",
@@ -4388,8 +4390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/93_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "xy7-94",
@@ -4450,8 +4452,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/94_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "xy7-95",
@@ -4517,8 +4519,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/96_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xy7-97",
@@ -4567,8 +4569,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/97_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xy7-98",
@@ -4620,8 +4622,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy7/98_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "xy7-99",
diff --git a/json/cards/Aquapolis.json b/json/cards/Aquapolis.json
index 98be2e078..c655fb00f 100644
--- a/json/cards/Aquapolis.json
+++ b/json/cards/Aquapolis.json
@@ -39,7 +39,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "50",
-        "text": "If you have any Benched Pokémon, take 1 basic Energy card attached to Ampharos, if any, and attach it to 1 of them."
+        "text": "If you have any Benched Pokémon and if there are any basic Energy cards attached to Ampharos, take 1 of those Energy cards and attach it to 1 of those Pokémon."
       }
     ],
     "weaknesses": [
@@ -48,8 +48,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ecard2-151",
@@ -100,8 +100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/151_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/151_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ecard2-2",
@@ -112,7 +112,7 @@
     "evolvesFrom": "Growlithe",
     "ability": {
       "name": "Extreme Speed",
-      "text": "Pay 1 less to retreat Arcanine for each Energy attached to Arcanine.",
+      "text": "You pay Colorless less to retreat Arcanine for each Energy attached to it.",
       "type": "Poké-Body"
     },
     "hp": "90",
@@ -149,8 +149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/2_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ecard2-152",
@@ -198,8 +198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/152_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/152_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ecard2-3",
@@ -232,7 +232,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "Flip a coin. If heads, this attack does 20 damage plus 10 more damage. If tails, the Defending Pokémon is now Paralyzed."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 10 more damage. If tails, this attack does 20 damage and the Defending Pokémon is now Paralyzed."
       }
     ],
     "weaknesses": [
@@ -241,8 +241,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/3_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "ecard2-153",
@@ -284,8 +284,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/153_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/153_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "ecard2-4",
@@ -296,7 +296,7 @@
     "evolvesFrom": "Marill",
     "ability": {
       "name": "Bubble Turn",
-      "text": "Once during your turn )before your attack), if Azumarill is on your Bench, you may flip a coin. If heads, return Azumarill and all cards attached to it to your hand.",
+      "text": "Once during your turn (before your attack), if Azumarill is on your bench, you may flip a coin. If heads, return Azumarill and all cards attached to it to your hand.",
       "type": "Poké-Power"
     },
     "hp": "70",
@@ -331,8 +331,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/4_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "ecard2-154",
@@ -378,8 +378,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/154_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/154_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "ecard2-5",
@@ -390,7 +390,7 @@
     "evolvesFrom": "Gloom",
     "ability": {
       "name": "Flower Supplement",
-      "text": "Once during your turn (before your attack), if you have any Basic Energy cards in your hand, you may flip a coin. If heads, attach 1 of those Energy cards to 1 of your Benched Pokémon, if any. You can't use this power if Bellossom is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), you may flip a coin. If heads, attach 1 basic Energy card from your hand to 1 of your Benched Pokémon. This power can't be used if Bellossom is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "90",
@@ -432,8 +432,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/5_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "ecard2-155",
@@ -486,8 +486,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/155_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/155_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "ecard2-6",
@@ -498,7 +498,7 @@
     "evolvesFrom": "Chansey",
     "ability": {
       "name": "Happy Healing",
-      "text": "Once during your turn (before your attack), if you have any Benched Pokémon, you may flip a coin. If heads, choose 1 of those Pokémon. Remove 1 damage counter from that Pokémon for each Energy attached to Blissey. This power can't be used if Blissey is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), choose 1 of your Benched Pokémon and flip a coin. If heads, count the number of Energy attached to Blissey and then remove that many damage counters from the chosen Benched Pokémon. This power can't be used if Blissey is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "120",
@@ -534,8 +534,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/6_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "ecard2-156",
@@ -582,8 +582,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/156_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/156_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "ecard2-157",
@@ -628,8 +628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/157_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/157_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ecard2-7",
@@ -686,8 +686,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/7_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "ecard2-158",
@@ -732,8 +732,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/158_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/158_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "ecard2-8",
@@ -744,7 +744,7 @@
     "evolvesFrom": "Voltorb",
     "ability": {
       "name": "Super Dynamo",
-      "text": "Once during your turn (before your attack), if Electrode is your Active Pokémon, you may flip a coin. If heads, choose 1 Lightning Energy card in your discard pile, if any, and attach it to 1 of your Pokémon. This power can't be used if Electrode is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), if Electrode is your Active Pokémon, you may flip a coin. If heads, choose a Lightning Energy card from your discard pile and attach it to 1 of your Pokémon. This power can't be used if Electrode is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "70",
@@ -778,8 +778,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/8_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ecard2-159",
@@ -822,8 +822,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/159_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/159_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "ecard2-9",
@@ -841,6 +841,9 @@
     "series": "E-Card",
     "set": "Aquapolis",
     "setCode": "ecard2",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Lightning"
     ],
@@ -855,11 +858,8 @@
         "text": "If your opponent has any Benched Pokémon, flip a coin. If heads, he or she chooses 1 of his or her Benched Pokémon and 1 Energy card attached to the Defending Pokémon, if any. Attach that Energy card to that Pokémon."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 239,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/9_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
     ]
@@ -907,8 +907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/10_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "ecard2-160",
@@ -956,8 +956,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/160_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/160_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "ecard2-161",
@@ -1014,8 +1014,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/161_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/161_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ecard2-11",
@@ -1049,7 +1049,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "Count the number of damage counters on the Defending Pokémon. Flip that many coins. This attack does 30 damage plus 10 more damage for each heads."
+        "text": "Flip a number of coins equal to the number of damage counters on the Defending Pokémon. This attack does 30 damage plus 10 more damage for each heads."
       }
     ],
     "weaknesses": [
@@ -1058,8 +1058,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/11_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "ecard2-12",
@@ -1089,7 +1089,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "40×",
-        "text": "Discard any number of Energy cards attached to any number of your Pokémon. Flip a number of coins equal to the number of Energy cards discarded this way. This attack does 40 damage times the number of heads."
+        "text": "Discard any number of Energy cards attached to any of your Pokémon. Flip a number of coins equal to the number of Energy cards discarded this way. This attack does 40 damage times the number of heads."
       },
       {
         "name": "Called Shot",
@@ -1107,8 +1107,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/12_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "ecard2-162",
@@ -1154,8 +1154,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/162_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/162_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "ecard2-163",
@@ -1202,8 +1202,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/163_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/163_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "ecard2-13",
@@ -1253,8 +1253,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/13_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "ecard2-14",
@@ -1304,8 +1304,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/14_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ecard2-164",
@@ -1354,8 +1354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/164_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/164_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ecard2-15",
@@ -1412,8 +1412,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/15_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ecard2-165",
@@ -1458,8 +1458,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/165_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/165_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ecard2-16",
@@ -1505,8 +1505,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/16_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "ecard2-166",
@@ -1544,7 +1544,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30",
-        "text": "This attack does 10 damage to each of your opponent's Benched Pokémon that are the same type (color) as the Defending Pokémon. (Don't apply Weakness and Resistance for Benched Pokémon)"
+        "text": "This attack does 10 damage to each of your opponent's Benched Pokémon that are the same type (color) as the Defending Pokémon. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
     "weaknesses": [
@@ -1559,8 +1559,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/166_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1610,8 +1610,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/17_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "ecard2-167",
@@ -1656,8 +1656,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/167_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/167_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "ecard2-18",
@@ -1708,8 +1708,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/18_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "ecard2-168",
@@ -1764,8 +1764,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/168_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/168_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "ecard2-19",
@@ -1776,7 +1776,7 @@
     "evolvesFrom": "Seadra",
     "ability": {
       "name": "Water Cyclone",
-      "text": "As often as you like during your turn (before your attack), you may move a Water Energy from your Active Pokémon to 1 of your Benched Pokémon. This power can't be used if Kingdra is affected by a Special Condition.",
+      "text": "As often as you like during your turn (before your attack), you may move a Water Energy card from your Active Pokémon to 1 of your Benched Pokémon. This power can't be used if Kingdra is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "120",
@@ -1805,7 +1805,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "50",
-        "text": "Flip a coin. If heads, discard 1 Energy card attached to the Defending Pokémon, if any. it."
+        "text": "Flip a coin. If heads, discard 1 Energy card attached to the Defending Pokémon, if any."
       }
     ],
     "weaknesses": [
@@ -1814,8 +1814,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/19_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ecard2-169",
@@ -1845,7 +1845,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Flip a coin. If heads, choose 1 Special Condition (Asleep, Burned, Confused, Paralysed, or Poisoned). The Defending Pokémon is now affected by that Special Condition."
+        "text": "Flip a coin. If heads, choose a Special Condition (Asleep, Burned, Confused, Paralyzed, or Poisoned). The Defending Pokémon is now affected by that Special Condition."
       },
       {
         "name": "Roasting Heat",
@@ -1865,8 +1865,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/169_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/169_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ecard2-20",
@@ -1916,8 +1916,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/20_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ecard2-170",
@@ -1964,8 +1964,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/170_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/170_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "ecard2-21",
@@ -1974,6 +1974,11 @@
     "subtype": "Stage 1",
     "supertype": "Pokémon",
     "evolvesFrom": "Chinchou",
+    "ability": {
+      "name": "Ion Coating",
+      "text": "You may use this power once during each of your turn (before your attack). All Lightning Energy attached to your Active Pokémon becomes Water Energy for the rest of your turn. (This effect ends if your Active Pokémon retreats or is returned to your hand). This power can't be used if Lanturn is affected by a Special Condition.",
+      "type": "Poké-Power"
+    },
     "hp": "80",
     "retreatCost": [
       "Colorless"
@@ -2005,8 +2010,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/21_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ecard2-171",
@@ -2054,7 +2059,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "Flip a number of coins equal to the amount of Energy attached to Scizor. This attack does 30 damage plus 20 more damage for each heads."
+        "text": "Flip a number of coins equal to the number of Metal Energy attached to Scizor. This attack does 30 damage plus 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -2063,8 +2068,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/171_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/171_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "ecard2-22",
@@ -2117,8 +2122,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/22_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2162,7 +2167,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40",
-        "text": "Look at a number of cards on top of your opponent's deck equal to the number of Energy cards attached to the Defending Pokémon. Put these cards in any order, and then put them back on top of your opponent's deck."
+        "text": "Look at a number of cards on top of your opponent's deck equal to the number of Energy cards attached to the Defending Pokémon. Put those cards in any order, and then put them back on top of your opponent's deck."
       }
     ],
     "weaknesses": [
@@ -2171,8 +2176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/172_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/172_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "ecard2-23",
@@ -2217,8 +2222,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/23_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "ecard2-173",
@@ -2252,7 +2257,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "10",
-        "text": "This attack does 10 damage to each of your opponent's Benched Pokémon. (Don't apply Weakness or Resistance for Benched Pokémon.) Then, flip a coin. If tails, this attack can't be used during your next turn. 10"
+        "text": "This attack does 10 damage to each of your opponent's Benched Pokémon. (Don't apply Weakness or Resistance for Benched Pokémon.) Then, flip a coin. If tails, this attack can't be used during your next turn."
       },
       {
         "name": "Iron Smash",
@@ -2279,8 +2284,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/173_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/173_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ecard2-174",
@@ -2328,8 +2333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/174_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/174_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "ecard2-24",
@@ -2384,8 +2389,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/24_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "ecard2-25",
@@ -2435,8 +2440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/25_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ecard2-175",
@@ -2481,8 +2486,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/175_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/175_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "ecard2-176",
@@ -2524,8 +2529,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/176_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/176_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "ecard2-26",
@@ -2572,8 +2577,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/26_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "ecard2-177",
@@ -2623,8 +2628,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/177_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -2676,8 +2681,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/27_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "ecard2-28",
@@ -2722,8 +2727,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/28_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -2797,8 +2802,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/178_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/178_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ecard2-179",
@@ -2822,6 +2827,9 @@
     "series": "E-Card",
     "set": "Aquapolis",
     "setCode": "ecard2",
+    "types": [
+      "Darkness"
+    ],
     "attacks": [
       {
         "name": "Shadow Bind",
@@ -2847,11 +2855,8 @@
         "value": "-30"
       }
     ],
-    "types": [
-      "Darkness"
-    ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/179_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/179_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ecard2-29",
@@ -2902,8 +2907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/29_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "ecard2-30",
@@ -2955,8 +2960,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/30_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "ecard2-180",
@@ -3003,8 +3008,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/180_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/180_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "ecard2-181",
@@ -3055,8 +3060,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/181_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/181_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "ecard2-31",
@@ -3104,8 +3109,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/31_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "ecard2-182",
@@ -3167,8 +3172,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/182_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/182_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "ecard2-32",
@@ -3179,7 +3184,7 @@
     "evolvesFrom": "Scyther",
     "ability": {
       "name": "Poison Resistance",
-      "text": "Scizor can't become Poisoned.",
+      "text": "Scizor can't be Poisoned.",
       "type": "Poké-Body"
     },
     "hp": "80",
@@ -3205,7 +3210,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20",
-        "text": "Before doing damage, if your opponent has any Benched Pokémon with no damage counters on it, you may choose 1 of them and switch it with the Defending Pokémon."
+        "text": "Before doing damage, you may choose 1 of your opponent's Benched Pokémon with no damage counters on it and snatch the Defending Pokémon with it."
       },
       {
         "name": "Heavy Metal",
@@ -3225,8 +3230,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/32_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "ecard2-33",
@@ -3272,8 +3277,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/33_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "ecard2-34",
@@ -3303,7 +3308,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "Look at your opponent's hand. This attack does 10 damage times the number of Energy cards in your opponent's hand."
+        "text": "Look at your opponent's hand. This attack does 10 damage times the number of Energy cards there."
       },
       {
         "name": "Shuffle Attack",
@@ -3323,8 +3328,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/34_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "ecard2-35",
@@ -3385,8 +3390,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/35_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ecard2-36",
@@ -3434,8 +3439,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/36_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "ecard2-37",
@@ -3445,7 +3450,7 @@
     "supertype": "Pokémon",
     "ability": {
       "name": "Pure Body",
-      "text": "Whenever you attach a Water Energy from your hand to Suicune, discard an Energy card attached to Suicune. (You can't attach a Water Energy card from your hand if Suicune has no Energy cards attached.)",
+      "text": "To attach a Water Energy card from your hand to Suicune, you must discard an Energy card attached to Suicune. (Attach the Water Energy, and then discard an Energy card from Suicune.)",
       "type": "Poké-Body"
     },
     "hp": "70",
@@ -3480,8 +3485,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/37_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "ecard2-38",
@@ -3523,8 +3528,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/38_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "ecard2-39",
@@ -3535,7 +3540,7 @@
     "evolvesFrom": "Togepi",
     "ability": {
       "name": "Miracle Shift",
-      "text": "Once during your turn (before your attack), discard a basic Energy card attached to one of your Pokémon. Then choose a basic Energy card from your discard pile and attach it to that Pokémon. This power can't be used if Togetic is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), discard a basic Energy card attached to 1 of your Pokémon. Then, choose a basic Energy card from your discard pile and attach it to that Pokémon. This power can't be used if Togetic is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "60",
@@ -3574,8 +3579,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/39_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -3649,8 +3654,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/40_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ecard2-41",
@@ -3661,7 +3666,7 @@
     "evolvesFrom": "Eevee",
     "ability": {
       "name": "Dark Moon",
-      "text": "As long as Umbreon is your Active Pokémon and has a Dark Energy attached to it, once during your turn (before your attack), you may look at your opponent's hand. Choose from it a number of cards up to the number of Dark Energy cards attached to Umbreon and shuffle them into your opponent's deck. Your opponent then draws the same number of cards from his or her deck. This power can't be used if Umbreon is affected by a Special Condition.",
+      "text": "As long as Umbreon is your Active Pokémon and has a Dark Energy attached to it, once during your turn (before your attack), you may look at your opponent's hand. Choose from it a number of cards up to the number of Dark Energy attached to Umbreon and shuffle them into your opponent's deck. Your opponent then draws the same number of cards from his or her deck. This power can't be used if Umbreon is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "80",
@@ -3702,8 +3707,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/41_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ecard2-42",
@@ -3750,8 +3755,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/42_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "ecard2-43",
@@ -3793,7 +3798,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40",
-        "text": "Flip a coin. If heads, your opponent can't play any Supporter cards during his or her next turn."
+        "text": "Flip a coin. If heads, your opponent can't play Supporter cards during his or her next turn."
       }
     ],
     "weaknesses": [
@@ -3802,8 +3807,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/43_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "ecard2-44",
@@ -3865,8 +3870,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/44_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "ecard2-45",
@@ -3905,8 +3910,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/45_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -3964,8 +3969,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/46_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "ecard2-47",
@@ -4015,8 +4020,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/47_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -4064,8 +4069,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/48_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "ecard2-49",
@@ -4111,8 +4116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/49_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -4167,8 +4172,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/50_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "ecard2-51",
@@ -4207,8 +4212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/51_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -4265,8 +4270,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/52_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -4317,8 +4322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/53_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -4378,8 +4383,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/54_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "ecard2-55",
@@ -4429,8 +4434,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/55_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -4474,8 +4479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/56_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -4527,8 +4532,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/57_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -4581,8 +4586,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/58_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -4636,8 +4641,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/59_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "ecard2-60",
@@ -4687,8 +4692,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/60_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -4709,6 +4714,9 @@
     "series": "E-Card",
     "set": "Aquapolis",
     "setCode": "ecard2",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Psychic"
     ],
@@ -4723,11 +4731,8 @@
         "text": "Flip a number of coins equal to the number of Energy cards on the Defending Pokémon. This attack does 10 damage times the number of heads."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 238,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/61_hires.png",
+    "nationalPokedexNumber": 238,
     "evolvesTo": [
       "Jynx"
     ]
@@ -4778,8 +4783,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/62_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -4800,6 +4805,9 @@
     "series": "E-Card",
     "set": "Aquapolis",
     "setCode": "ecard2",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Fighting"
     ],
@@ -4814,11 +4822,8 @@
         "text": "Flip a coin. If heads, discard a Special Energy card attached to the Defending Pokémon. If tails, this attack does nothing."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 236,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/63_hires.png",
+    "nationalPokedexNumber": 236,
     "evolvesTo": [
       "Hitmonlee",
       "Hitmonchan",
@@ -4871,8 +4876,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/64_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4924,8 +4929,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/65_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -4975,8 +4980,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/66_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -5027,8 +5032,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/67_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -5078,8 +5083,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/68_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -5132,8 +5137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/69_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -5184,8 +5189,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/70_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -5236,8 +5241,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/71_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -5293,8 +5298,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/72_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -5351,8 +5356,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/73_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -5403,8 +5408,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/74_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -5454,8 +5459,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/75_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -5512,8 +5517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/76_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -5563,8 +5568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/77_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -5605,8 +5610,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/78_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -5647,8 +5652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/79_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -5698,8 +5703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/80_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -5753,8 +5758,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/81_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "ecard2-82",
@@ -5804,8 +5809,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/82_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "ecard2-83",
@@ -5854,8 +5859,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/83_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -5896,8 +5901,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/84_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -5939,8 +5944,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/85_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -5991,8 +5996,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/86_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -6040,8 +6045,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/87_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -6095,8 +6100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/88_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "ecard2-89",
@@ -6143,8 +6148,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/89_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -6198,8 +6203,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/90_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -6246,8 +6251,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/91_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -6298,8 +6303,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/92_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -6350,8 +6355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/93_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -6403,8 +6408,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/94_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "ecard2-95",
@@ -6443,8 +6448,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/95_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "ecard2-96",
@@ -6492,8 +6497,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/96_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -6544,8 +6549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/97_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -6588,8 +6593,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/98_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -6640,8 +6645,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/99_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -6698,8 +6703,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/100_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -6752,8 +6757,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/101_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "ecard2-102",
@@ -6801,8 +6806,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/102_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -6852,8 +6857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/103_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -6904,8 +6909,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/104_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -6946,8 +6951,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/105_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -7004,8 +7009,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/106_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -7055,8 +7060,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/107_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -7107,8 +7112,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/108_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -7160,8 +7165,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/109_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "ecard2-110",
@@ -7215,8 +7220,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/110_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -7257,8 +7262,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/111_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -7318,8 +7323,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/112_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -7369,8 +7374,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/113_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -7420,8 +7425,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/114_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -7462,8 +7467,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/115_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -7504,8 +7509,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/116_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -7556,8 +7561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/117_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -8130,8 +8135,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/148_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/148_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ecard2-149",
@@ -8189,8 +8194,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/149_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/149_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "ecard2-150",
@@ -8245,7 +8250,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard2/150_hires.png",
+    "nationalPokedexNumber": 34
   }
 ]
diff --git a/json/cards/Arceus.json b/json/cards/Arceus.json
index 64924b32b..2f99ef41c 100644
--- a/json/cards/Arceus.json
+++ b/json/cards/Arceus.json
@@ -61,8 +61,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/1_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "pl4-2",
@@ -108,8 +108,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 478,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/2_hires.png",
+    "nationalPokedexNumber": 478
   },
   {
     "id": "pl4-3",
@@ -163,8 +163,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/3_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "pl4-4",
@@ -216,8 +216,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/4_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "pl4-5",
@@ -271,8 +271,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/5_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "pl4-6",
@@ -324,8 +324,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 414,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/6_hires.png",
+    "nationalPokedexNumber": 414,
     "evolvesTo": [
       "Burmy"
     ]
@@ -393,8 +393,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/7_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "pl4-8",
@@ -460,8 +460,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/8_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "pl4-9",
@@ -514,8 +514,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 317,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/9_hires.png",
+    "nationalPokedexNumber": 317
   },
   {
     "id": "pl4-10",
@@ -576,8 +576,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/10_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "pl4-11",
@@ -627,8 +627,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/11_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "pl4-12",
@@ -685,8 +685,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/12_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "pl4-13",
@@ -738,8 +738,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/13_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "pl4-14",
@@ -799,8 +799,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/14_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "pl4-15",
@@ -852,8 +852,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/15_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "pl4-16",
@@ -903,8 +903,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/16_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "pl4-17",
@@ -959,8 +959,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/17_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "pl4-18",
@@ -1012,8 +1012,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/18_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "pl4-19",
@@ -1058,7 +1058,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard as many Fighting Energy cards as you like from your hand. This attack does 30 damage times the number of Fighting Energy cards you discarded."
       },
       {
@@ -1086,8 +1086,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/19_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "pl4-20",
@@ -1144,8 +1144,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/20_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "pl4-21",
@@ -1191,8 +1191,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/21_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "pl4-22",
@@ -1247,8 +1247,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/22_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "pl4-23",
@@ -1299,8 +1299,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/23_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "pl4-24",
@@ -1360,8 +1360,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/24_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "pl4-25",
@@ -1411,8 +1411,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/25_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -1461,8 +1461,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/26_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "pl4-27",
@@ -1519,8 +1519,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/27_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "pl4-28",
@@ -1573,8 +1573,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/28_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "pl4-29",
@@ -1620,8 +1620,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/29_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "pl4-30",
@@ -1657,7 +1657,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Grass Energy attached to Sceptile."
       },
       {
@@ -1685,8 +1685,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/30_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "pl4-31",
@@ -1727,7 +1727,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "70x",
+        "damage": "70×",
         "text": "Flip 2 coins. This attack does 70 damage times the number of heads."
       }
     ],
@@ -1743,8 +1743,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/31_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "pl4-32",
@@ -1797,8 +1797,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/32_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "pl4-33",
@@ -1857,8 +1857,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/33_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "pl4-34",
@@ -1915,8 +1915,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/34_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -1950,7 +1950,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -1971,8 +1971,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/35_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -2030,8 +2030,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/36_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -2094,8 +2094,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/37_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -2154,8 +2154,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/38_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -2216,8 +2216,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/39_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -2269,8 +2269,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/40_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -2325,8 +2325,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/41_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2385,8 +2385,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/42_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2430,7 +2430,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Discard all Lightning Energy attached to Luxio. Flip a coin for each Energy card you discarded. This attack does 40 damage times the number of heads."
       }
     ],
@@ -2446,8 +2446,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/43_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -2504,8 +2504,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/44_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "pl4-45",
@@ -2563,8 +2563,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/45_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "pl4-46",
@@ -2613,8 +2613,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/46_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -2664,8 +2664,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/47_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "pl4-48",
@@ -2716,8 +2716,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/48_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2771,8 +2771,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/49_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2832,8 +2832,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/50_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2892,8 +2892,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/51_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2945,8 +2945,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/52_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2989,7 +2989,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2999,8 +2999,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/53_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "pl4-54",
@@ -3056,8 +3056,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/54_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3099,8 +3099,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/55_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -3148,8 +3148,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/56_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -3197,8 +3197,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/57_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -3246,8 +3246,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/58_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -3299,8 +3299,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/59_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3358,8 +3358,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/60_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -3411,8 +3411,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/61_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -3470,8 +3470,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/62_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3519,8 +3519,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/63_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3578,8 +3578,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/64_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -3612,7 +3612,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3628,8 +3628,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/65_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -3681,8 +3681,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/66_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -3735,8 +3735,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/67_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -3789,8 +3789,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/68_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3842,8 +3842,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/69_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -3896,8 +3896,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/70_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3956,8 +3956,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/71_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4009,8 +4009,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/72_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -4049,8 +4049,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/73_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4108,8 +4108,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/74_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -4151,7 +4151,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4161,8 +4161,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/75_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -4222,8 +4222,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/76_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -4282,8 +4282,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/77_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -4332,8 +4332,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/78_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -4391,8 +4391,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/79_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -4450,8 +4450,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/80_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -4499,8 +4499,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/81_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -4758,8 +4758,8 @@
     "types": [
       "Colorless"
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/94_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-95",
@@ -4802,8 +4802,8 @@
         "text": "Flip a coin. If tails, this attack's base damage is 50 instead of 100."
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/95_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-96",
@@ -4846,8 +4846,8 @@
         "text": "Discard a Lightning Energy and a Psychic Energy attached to Arceus."
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/96_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-97",
@@ -4899,8 +4899,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/97_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "pl4-98",
@@ -4957,8 +4957,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/98_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "pl4-99",
@@ -5013,8 +5013,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/99_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "pl4-SH10",
@@ -5058,8 +5058,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/SH10_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -5107,8 +5107,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/SH11_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -5161,8 +5161,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/SH12_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -5211,8 +5211,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR1_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR2",
@@ -5259,8 +5259,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR2_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR3",
@@ -5301,8 +5301,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR3_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR4",
@@ -5344,8 +5344,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR4_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR5",
@@ -5395,8 +5395,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR5_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR6",
@@ -5442,8 +5442,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR6_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR7",
@@ -5484,8 +5484,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR7_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR8",
@@ -5533,8 +5533,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR8_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "pl4-AR9",
@@ -5582,7 +5582,7 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR9_hires.png",
+    "nationalPokedexNumber": 493
   }
 ]
diff --git a/json/cards/BREAKpoint.json b/json/cards/BREAKpoint.json
index 114b5a66c..9e9edf04c 100644
--- a/json/cards/BREAKpoint.json
+++ b/json/cards/BREAKpoint.json
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/1_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -99,8 +99,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/2_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -151,8 +151,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/3_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "xy9-4",
@@ -190,8 +190,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/4_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -232,8 +232,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 401,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/5_hires.png",
+    "nationalPokedexNumber": 401,
     "evolvesTo": [
       "Kricketune"
     ]
@@ -284,8 +284,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 402,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/6_hires.png",
+    "nationalPokedexNumber": 402
   },
   {
     "id": "xy9-7",
@@ -323,8 +323,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 548,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/7_hires.png",
+    "nationalPokedexNumber": 548,
     "evolvesTo": [
       "Lilligant"
     ]
@@ -376,8 +376,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 549,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/8_hires.png",
+    "nationalPokedexNumber": 549
   },
   {
     "id": "xy9-9",
@@ -425,8 +425,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 632,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/9_hires.png",
+    "nationalPokedexNumber": 632
   },
   {
     "id": "xy9-10",
@@ -466,8 +466,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/10_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -521,8 +521,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/11_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "xy9-12",
@@ -573,8 +573,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/12_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -631,8 +631,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/13_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "xy9-14",
@@ -688,8 +688,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/14_hires.png",
+    "nationalPokedexNumber": 500
   },
   {
     "id": "xy9-15",
@@ -739,8 +739,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 631,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/15_hires.png",
+    "nationalPokedexNumber": 631
   },
   {
     "id": "xy9-16",
@@ -779,8 +779,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/16_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -833,8 +833,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/17_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "xy9-18",
@@ -861,8 +861,8 @@
     "types": [
       "Water"
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/18_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "xy9-19",
@@ -911,8 +911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/19_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -967,8 +967,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/20_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "xy9-21",
@@ -1014,8 +1014,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/21_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "xy9-22",
@@ -1054,8 +1054,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/22_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -1097,8 +1097,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/23_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -1152,8 +1152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/24_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "xy9-25",
@@ -1188,8 +1188,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/25_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -1248,8 +1248,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/26_hires.png",
+    "nationalPokedexNumber": 130,
     "evolvesTo": "M Gyarados-EX"
   },
   {
@@ -1297,8 +1297,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/27_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xy9-28",
@@ -1348,8 +1348,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/28_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "xy9-29",
@@ -1399,8 +1399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/29_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "xy9-30",
@@ -1445,8 +1445,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/30_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "xy9-31",
@@ -1501,8 +1501,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/31_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "xy9-32",
@@ -1549,8 +1549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/32_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "xy9-33",
@@ -1598,8 +1598,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 535,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/33_hires.png",
+    "nationalPokedexNumber": 535,
     "evolvesTo": [
       "Palpitoad"
     ]
@@ -1655,8 +1655,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 536,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/34_hires.png",
+    "nationalPokedexNumber": 536,
     "evolvesTo": [
       "Seismitoad"
     ]
@@ -1712,8 +1712,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/35_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "xy9-36",
@@ -1757,8 +1757,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/36_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -1814,8 +1814,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 581,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/37_hires.png",
+    "nationalPokedexNumber": 581
   },
   {
     "id": "xy9-38",
@@ -1853,8 +1853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 656,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/38_hires.png",
+    "nationalPokedexNumber": 656,
     "evolvesTo": [
       "Frogadier"
     ]
@@ -1896,8 +1896,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 657,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/39_hires.png",
+    "nationalPokedexNumber": 657,
     "evolvesTo": [
       "Greninja"
     ]
@@ -1945,8 +1945,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/40_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xy9-41",
@@ -1973,8 +1973,8 @@
     "types": [
       "Water"
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/41_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xy9-42",
@@ -2014,8 +2014,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/42_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -2071,8 +2071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/43_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "xy9-44",
@@ -2125,8 +2125,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/44_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -2184,8 +2184,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/45_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -2245,8 +2245,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/46_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "xy9-47",
@@ -2282,8 +2282,8 @@
         "text": "Flip a coin until you get tails. This attack does 40 more damage for each heads."
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/47_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "xy9-48",
@@ -2327,8 +2327,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 522,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/48_hires.png",
+    "nationalPokedexNumber": 522,
     "evolvesTo": [
       "Zebstrika"
     ]
@@ -2382,8 +2382,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 523,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/49_hires.png",
+    "nationalPokedexNumber": 523
   },
   {
     "id": "xy9-50",
@@ -2432,8 +2432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/50_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -2482,8 +2482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/51_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "xy9-52",
@@ -2535,8 +2535,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/52_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "xy9-53",
@@ -2576,8 +2576,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 451,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/53_hires.png",
+    "nationalPokedexNumber": 451,
     "evolvesTo": [
       "Drapion"
     ]
@@ -2636,8 +2636,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/54_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "xy9-55",
@@ -2691,8 +2691,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/55_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "xy9-56",
@@ -2731,8 +2731,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/56_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -2784,8 +2784,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/57_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "xy9-58",
@@ -2823,8 +2823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 677,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/58_hires.png",
+    "nationalPokedexNumber": 677,
     "evolvesTo": [
       "Meowstic"
     ]
@@ -2876,8 +2876,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 678,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/59_hires.png",
+    "nationalPokedexNumber": 678
   },
   {
     "id": "xy9-60",
@@ -2922,8 +2922,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 679,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/60_hires.png",
+    "nationalPokedexNumber": 679,
     "evolvesTo": [
       "Doublade"
     ]
@@ -2973,8 +2973,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 680,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/61_hires.png",
+    "nationalPokedexNumber": 680,
     "evolvesTo": [
       "Aegislash"
     ]
@@ -3038,8 +3038,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 681,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/62_hires.png",
+    "nationalPokedexNumber": 681
   },
   {
     "id": "xy9-63",
@@ -3077,8 +3077,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 690,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/63_hires.png",
+    "nationalPokedexNumber": 690,
     "evolvesTo": [
       "Dragalge"
     ]
@@ -3126,8 +3126,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 708,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/64_hires.png",
+    "nationalPokedexNumber": 708,
     "evolvesTo": [
       "Trevenant"
     ]
@@ -3184,8 +3184,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/65_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xy9-66",
@@ -3219,8 +3219,8 @@
         "text": "Put 3 damage counters on each of your opponent's Pokémon."
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/66_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xy9-67",
@@ -3260,8 +3260,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/67_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "xy9-68",
@@ -3299,8 +3299,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/68_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -3342,8 +3342,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/69_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -3392,8 +3392,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/70_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "xy9-71",
@@ -3442,8 +3442,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 674,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/71_hires.png",
+    "nationalPokedexNumber": 674,
     "evolvesTo": [
       "Pangoro"
     ]
@@ -3501,8 +3501,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/72_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -3562,8 +3562,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/73_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "xy9-74",
@@ -3623,8 +3623,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/74_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "xy9-75",
@@ -3682,8 +3682,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 675,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/75_hires.png",
+    "nationalPokedexNumber": 675
   },
   {
     "id": "xy9-76",
@@ -3741,8 +3741,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/76_hires.png",
+    "nationalPokedexNumber": 212,
     "evolvesTo": "M Scizor-EX"
   },
   {
@@ -3794,8 +3794,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/77_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "xy9-78",
@@ -3850,8 +3850,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/78_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "xy9-79",
@@ -3897,8 +3897,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 597,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/79_hires.png",
+    "nationalPokedexNumber": 597,
     "evolvesTo": [
       "Ferrothorn"
     ]
@@ -3960,8 +3960,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 598,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/80_hires.png",
+    "nationalPokedexNumber": 598
   },
   {
     "id": "xy9-81",
@@ -4015,8 +4015,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/81_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -4075,8 +4075,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/82_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "xy9-83",
@@ -4135,8 +4135,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/83_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "xy9-84",
@@ -4180,8 +4180,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 682,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/84_hires.png",
+    "nationalPokedexNumber": 682,
     "evolvesTo": [
       "Aromatisse"
     ]
@@ -4239,8 +4239,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 683,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/85_hires.png",
+    "nationalPokedexNumber": 683
   },
   {
     "id": "xy9-86",
@@ -4290,8 +4290,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 691,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/86_hires.png",
+    "nationalPokedexNumber": 691
   },
   {
     "id": "xy9-87",
@@ -4329,8 +4329,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/87_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4374,8 +4374,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/88_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "xy9-89",
@@ -4409,8 +4409,8 @@
         "text": "Put damage counters on your opponent's Active Pokémon until its remaining HP is 10."
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/89_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "xy9-90",
@@ -4457,8 +4457,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/90_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "xy9-91",
@@ -4506,8 +4506,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/91_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "xy9-92",
@@ -4562,8 +4562,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/92_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "xy9-93",
@@ -4611,8 +4611,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 431,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/93_hires.png",
+    "nationalPokedexNumber": 431,
     "evolvesTo": [
       "Purugly"
     ]
@@ -4667,8 +4667,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 432,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/94_hires.png",
+    "nationalPokedexNumber": 432
   },
   {
     "id": "xy9-95",
@@ -4716,8 +4716,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 676,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/95_hires.png",
+    "nationalPokedexNumber": 676
   },
   {
     "id": "xy9-96",
@@ -5114,8 +5114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/114_hires.png",
+    "nationalPokedexNumber": 130,
     "evolvesTo": "M Gyarados-EX"
   },
   {
@@ -5163,8 +5163,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/115_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xy9-116",
@@ -5211,8 +5211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/116_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/116_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "xy9-117",
@@ -5264,8 +5264,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/117_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/117_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "xy9-118",
@@ -5325,8 +5325,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/118_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "xy9-119",
@@ -5384,8 +5384,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/119_hires.png",
+    "nationalPokedexNumber": 212,
     "evolvesTo": "M Scizor-EX"
   },
   {
@@ -5437,8 +5437,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/120_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "xy9-121",
@@ -5493,8 +5493,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/121_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy9/121_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "xy9-122",
@@ -5567,8 +5567,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy9/123_hires.png",
+    "nationalPokedexNumber": 130,
     "evolvesTo": "M Gyarados-EX"
   }
 ]
diff --git a/json/cards/BREAKthrough.json b/json/cards/BREAKthrough.json
index 7c1f9174f..357c1d5f3 100644
--- a/json/cards/BREAKthrough.json
+++ b/json/cards/BREAKthrough.json
@@ -35,8 +35,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/1_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -89,8 +89,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/2_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "xy8-3",
@@ -140,8 +140,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/3_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "xy8-4",
@@ -179,8 +179,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/4_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -221,8 +221,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/5_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -274,8 +274,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 512,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/6_hires.png",
+    "nationalPokedexNumber": 512
   },
   {
     "id": "xy8-7",
@@ -324,8 +324,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/7_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -377,8 +377,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/8_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -430,8 +430,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/9_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -487,8 +487,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 651,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/10_hires.png",
+    "nationalPokedexNumber": 651,
     "evolvesTo": [
       "Chesnaught"
     ]
@@ -547,8 +547,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 652,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/11_hires.png",
+    "nationalPokedexNumber": 652
   },
   {
     "id": "xy8-12",
@@ -584,8 +584,8 @@
         "text": "This Pokémon does 30 damage to itself. This attack does 30 damage to 1 of your opponent's Benched Pokémon. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
-    "nationalPokedexNumber": 652,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/12_hires.png",
+    "nationalPokedexNumber": 652
   },
   {
     "id": "xy8-13",
@@ -633,8 +633,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 664,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/13_hires.png",
+    "nationalPokedexNumber": 664,
     "evolvesTo": [
       "Spewpa"
     ]
@@ -687,8 +687,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 665,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/14_hires.png",
+    "nationalPokedexNumber": 665,
     "evolvesTo": [
       "Vivillon"
     ]
@@ -737,8 +737,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 666,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/15_hires.png",
+    "nationalPokedexNumber": 666
   },
   {
     "id": "xy8-16",
@@ -787,8 +787,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 672,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/16_hires.png",
+    "nationalPokedexNumber": 672,
     "evolvesTo": [
       "Gogoat"
     ]
@@ -842,8 +842,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 673,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/17_hires.png",
+    "nationalPokedexNumber": 673
   },
   {
     "id": "xy8-18",
@@ -891,8 +891,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/18_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -935,8 +935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/19_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -991,8 +991,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/20_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "xy8-21",
@@ -1044,8 +1044,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/21_hires.png",
+    "nationalPokedexNumber": 229,
     "evolvesTo": "M Houndoom-EX"
   },
   {
@@ -1090,8 +1090,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/22_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "xy8-23",
@@ -1129,8 +1129,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/23_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -1182,8 +1182,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/24_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "xy8-25",
@@ -1222,8 +1222,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 653,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/25_hires.png",
+    "nationalPokedexNumber": 653,
     "evolvesTo": [
       "Braixen"
     ]
@@ -1267,8 +1267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 654,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/26_hires.png",
+    "nationalPokedexNumber": 654,
     "evolvesTo": [
       "Delphox"
     ]
@@ -1309,8 +1309,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/27_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -1362,8 +1362,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/28_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "xy8-29",
@@ -1401,8 +1401,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/29_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -1454,8 +1454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/30_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "xy8-31",
@@ -1503,8 +1503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/31_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -1555,8 +1555,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/32_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -1606,8 +1606,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/33_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "xy8-34",
@@ -1661,8 +1661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/34_hires.png",
+    "nationalPokedexNumber": 362,
     "evolvesTo": "M Glalie-EX"
   },
   {
@@ -1710,8 +1710,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/35_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "xy8-36",
@@ -1750,8 +1750,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/36_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -1794,8 +1794,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 394,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/37_hires.png",
+    "nationalPokedexNumber": 394,
     "evolvesTo": [
       "Empoleon"
     ]
@@ -1844,8 +1844,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/38_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "xy8-39",
@@ -1896,8 +1896,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 459,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/39_hires.png",
+    "nationalPokedexNumber": 459,
     "evolvesTo": [
       "Abomasnow"
     ]
@@ -1956,8 +1956,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 460,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/40_hires.png",
+    "nationalPokedexNumber": 460
   },
   {
     "id": "xy8-41",
@@ -1995,8 +1995,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 515,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/41_hires.png",
+    "nationalPokedexNumber": 515,
     "evolvesTo": [
       "Simipour"
     ]
@@ -2048,8 +2048,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 516,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/42_hires.png",
+    "nationalPokedexNumber": 516
   },
   {
     "id": "xy8-43",
@@ -2097,8 +2097,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 582,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/43_hires.png",
+    "nationalPokedexNumber": 582,
     "evolvesTo": [
       "Vanillish"
     ]
@@ -2151,8 +2151,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 583,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/44_hires.png",
+    "nationalPokedexNumber": 583,
     "evolvesTo": [
       "Vanilluxe"
     ]
@@ -2206,8 +2206,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 584,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/45_hires.png",
+    "nationalPokedexNumber": 584
   },
   {
     "id": "xy8-46",
@@ -2245,8 +2245,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 656,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/46_hires.png",
+    "nationalPokedexNumber": 656,
     "evolvesTo": [
       "Frogadier"
     ]
@@ -2289,8 +2289,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 657,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/47_hires.png",
+    "nationalPokedexNumber": 657,
     "evolvesTo": [
       "Greninja"
     ]
@@ -2347,8 +2347,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/48_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -2405,8 +2405,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/49_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "xy8-50",
@@ -2441,8 +2441,8 @@
         "text": "Discard all Energy attached to this Pokémon."
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/50_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "xy8-51",
@@ -2492,8 +2492,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/51_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2550,8 +2550,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/52_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2610,8 +2610,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/53_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2668,8 +2668,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/54_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "xy8-55",
@@ -2720,8 +2720,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/55_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "xy8-56",
@@ -2779,8 +2779,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 618,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/56_hires.png",
+    "nationalPokedexNumber": 618
   },
   {
     "id": "xy8-57",
@@ -2824,8 +2824,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 702,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/57_hires.png",
+    "nationalPokedexNumber": 702
   },
   {
     "id": "xy8-58",
@@ -2869,8 +2869,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/58_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -2924,8 +2924,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/59_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2980,8 +2980,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/60_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "xy8-61",
@@ -3036,8 +3036,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/61_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -3091,8 +3091,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/62_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -3141,8 +3141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/63_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xy8-64",
@@ -3187,8 +3187,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/64_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xy8-65",
@@ -3232,8 +3232,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/65_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -3288,8 +3288,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/66_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "xy8-67",
@@ -3340,8 +3340,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/67_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "xy8-68",
@@ -3389,8 +3389,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/68_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3442,8 +3442,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/69_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -3493,8 +3493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/70_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "xy8-71",
@@ -3547,8 +3547,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 527,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/71_hires.png",
+    "nationalPokedexNumber": 527,
     "evolvesTo": [
       "Swoobat"
     ]
@@ -3605,8 +3605,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 528,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/72_hires.png",
+    "nationalPokedexNumber": 528
   },
   {
     "id": "xy8-73",
@@ -3644,8 +3644,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/73_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -3697,8 +3697,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 606,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/74_hires.png",
+    "nationalPokedexNumber": 606
   },
   {
     "id": "xy8-75",
@@ -3746,8 +3746,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/75_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -3800,8 +3800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/76_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "xy8-77",
@@ -3841,8 +3841,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/77_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -3895,8 +3895,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/78_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "xy8-79",
@@ -3930,8 +3930,8 @@
         "text": "This attack does 40 more damage for each Prize card your opponent has taken."
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/79_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "xy8-80",
@@ -3980,8 +3980,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/80_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -4036,8 +4036,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/81_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -4090,8 +4090,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 473,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/82_hires.png",
+    "nationalPokedexNumber": 473
   },
   {
     "id": "xy8-83",
@@ -4133,8 +4133,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/83_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -4183,8 +4183,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/84_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "xy8-85",
@@ -4233,8 +4233,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/85_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "xy8-86",
@@ -4274,8 +4274,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 674,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/86_hires.png",
+    "nationalPokedexNumber": 674,
     "evolvesTo": [
       "Pangoro"
     ]
@@ -4332,8 +4332,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 701,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/87_hires.png",
+    "nationalPokedexNumber": 701
   },
   {
     "id": "xy8-88",
@@ -4389,8 +4389,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/88_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "xy8-89",
@@ -4444,8 +4444,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/89_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -4502,8 +4502,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/90_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -4558,8 +4558,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/91_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "xy8-92",
@@ -4592,8 +4592,8 @@
         "text": "Choose 1 of your opponent's Active Pokémon's attacks and use it as this attack."
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/92_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "xy8-93",
@@ -4638,8 +4638,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 686,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/93_hires.png",
+    "nationalPokedexNumber": 686,
     "evolvesTo": [
       "Malamar"
     ]
@@ -4694,8 +4694,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/94_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xy8-95",
@@ -4741,8 +4741,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/95_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -4804,8 +4804,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/96_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "xy8-97",
@@ -4855,8 +4855,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/97_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "xy8-98",
@@ -4912,8 +4912,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/98_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -4975,8 +4975,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/99_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "xy8-100",
@@ -5030,8 +5030,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/100_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -5078,8 +5078,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 669,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/101_hires.png",
+    "nationalPokedexNumber": 669,
     "evolvesTo": [
       "Floette"
     ]
@@ -5137,8 +5137,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 670,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/102_hires.png",
+    "nationalPokedexNumber": 670,
     "evolvesTo": [
       "Florges"
     ]
@@ -5193,8 +5193,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 671,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/103_hires.png",
+    "nationalPokedexNumber": 671
   },
   {
     "id": "xy8-104",
@@ -5221,8 +5221,8 @@
     "types": [
       "Fairy"
     ],
-    "nationalPokedexNumber": 671,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/104_hires.png",
+    "nationalPokedexNumber": 671
   },
   {
     "id": "xy8-105",
@@ -5266,8 +5266,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 682,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/105_hires.png",
+    "nationalPokedexNumber": 682,
     "evolvesTo": [
       "Aromatisse"
     ]
@@ -5324,8 +5324,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 683,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/106_hires.png",
+    "nationalPokedexNumber": 683
   },
   {
     "id": "xy8-107",
@@ -5384,8 +5384,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/107_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xy8-108",
@@ -5435,8 +5435,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/108_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -5489,8 +5489,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/109_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -5544,8 +5544,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 611,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/110_hires.png",
+    "nationalPokedexNumber": 611,
     "evolvesTo": [
       "Haxorus"
     ]
@@ -5608,8 +5608,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 612,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/111_hires.png",
+    "nationalPokedexNumber": 612
   },
   {
     "id": "xy8-112",
@@ -5659,8 +5659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 715,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/112_hires.png",
+    "nationalPokedexNumber": 715
   },
   {
     "id": "xy8-113",
@@ -5695,8 +5695,8 @@
         "text": "If you have the same number of cards in your hand as your opponent, this attack does 80 more damage."
       }
     ],
-    "nationalPokedexNumber": 715,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/113_hires.png",
+    "nationalPokedexNumber": 715
   },
   {
     "id": "xy8-114",
@@ -5734,8 +5734,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/114_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -5792,8 +5792,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/115_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -5850,8 +5850,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/116_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -5906,8 +5906,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/117_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/117_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "xy8-118",
@@ -5956,8 +5956,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/118_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "xy8-119",
@@ -6002,8 +6002,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/119_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -6063,8 +6063,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/120_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "xy8-121",
@@ -6104,8 +6104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/121_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -6163,8 +6163,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/122_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "xy8-123",
@@ -6208,8 +6208,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/123_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/123_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "xy8-124",
@@ -6253,8 +6253,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/124_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -6301,8 +6301,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/125_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -6360,8 +6360,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/126_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -6421,8 +6421,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 398,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/127_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/127_hires.png",
+    "nationalPokedexNumber": 398
   },
   {
     "id": "xy8-128",
@@ -6476,8 +6476,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/128_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/128_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "xy8-129",
@@ -6522,8 +6522,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 627,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/129_hires.png",
+    "nationalPokedexNumber": 627,
     "evolvesTo": [
       "Braviary"
     ]
@@ -6585,8 +6585,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 628,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/130_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/130_hires.png",
+    "nationalPokedexNumber": 628
   },
   {
     "id": "xy8-131",
@@ -6630,8 +6630,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 714,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/131_hires.png",
+    "nationalPokedexNumber": 714,
     "evolvesTo": [
       "Noivern"
     ]
@@ -6688,8 +6688,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 714,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/132_hires.png",
+    "nationalPokedexNumber": 714,
     "evolvesTo": [
       "Noivern"
     ]
@@ -7085,8 +7085,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/153_hires.png",
+    "nationalPokedexNumber": 229,
     "evolvesTo": "M Houndoom-EX"
   },
   {
@@ -7131,8 +7131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/154_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/154_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "xy8-155",
@@ -7186,8 +7186,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/155_hires.png",
+    "nationalPokedexNumber": 362,
     "evolvesTo": "M Glalie-EX"
   },
   {
@@ -7235,8 +7235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/156_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/156_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "xy8-157",
@@ -7291,8 +7291,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/157_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -7346,8 +7346,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/158_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -7396,8 +7396,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/159_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/159_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xy8-160",
@@ -7442,8 +7442,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/160_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy8/160_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xy8-161",
@@ -7532,8 +7532,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/163_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -7587,8 +7587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/164_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   }
 ]
diff --git a/json/cards/BW Black Star Promos.json b/json/cards/BW Black Star Promos.json
index da73052ef..afc11744b 100644
--- a/json/cards/BW Black Star Promos.json	
+++ b/json/cards/BW Black Star Promos.json	
@@ -26,7 +26,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -42,8 +42,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW01_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -86,8 +86,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 498,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW02_hires.png",
+    "nationalPokedexNumber": 498,
     "evolvesTo": [
       "Pignite"
     ]
@@ -129,8 +129,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW03_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -184,8 +184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW04_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW04_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bwp-BW05",
@@ -236,8 +236,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW05_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW05_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bwp-BW06",
@@ -291,8 +291,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW06_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -343,8 +343,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 498,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW07_hires.png",
+    "nationalPokedexNumber": 498,
     "evolvesTo": [
       "Pignite"
     ]
@@ -395,8 +395,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW08_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -454,8 +454,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW09_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW09_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "bwp-BW10",
@@ -488,8 +488,8 @@
         "text": "Flip 2 coins. If either of them is tails, this attack does nothing."
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW10_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -521,7 +521,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -537,8 +537,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW11_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -586,8 +586,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW12_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -638,8 +638,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW13_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -671,7 +671,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -687,8 +687,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW14_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -736,8 +736,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 519,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW15_hires.png",
+    "nationalPokedexNumber": 519,
     "evolvesTo": [
       "Tranquill"
     ]
@@ -773,8 +773,8 @@
         "text": "Flip 2 coins. If either of them is tails, this attack does nothing."
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW16_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -821,8 +821,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW17_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -865,8 +865,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 554,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW18_hires.png",
+    "nationalPokedexNumber": 554,
     "evolvesTo": [
       "Darmanitan"
     ]
@@ -925,8 +925,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW19_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "bwp-BW20",
@@ -977,8 +977,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW20_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bwp-BW21",
@@ -1028,8 +1028,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW21_hires.png",
+    "nationalPokedexNumber": 500
   },
   {
     "id": "bwp-BW22",
@@ -1076,8 +1076,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 503,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW22_hires.png",
+    "nationalPokedexNumber": 503
   },
   {
     "id": "bwp-BW23",
@@ -1128,8 +1128,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW23_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bwp-BW24",
@@ -1180,8 +1180,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW24_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bwp-BW25",
@@ -1236,8 +1236,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW25_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -1273,8 +1273,8 @@
         "text": "The Defending Pokémon can't retreat during your opponent's next turn."
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW26_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -1325,8 +1325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW27_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -1442,8 +1442,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW32_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bwp-BW33",
@@ -1491,8 +1491,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW33_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -1545,8 +1545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW34_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -1597,8 +1597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW35_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -1622,6 +1622,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Fire"
     ],
@@ -1656,8 +1659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW36_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bwp-BW37",
@@ -1678,6 +1681,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Water"
     ],
@@ -1712,8 +1718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW37_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bwp-BW38",
@@ -1734,6 +1740,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Lightning"
     ],
@@ -1768,8 +1777,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW38_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bwp-BW39",
@@ -1834,8 +1843,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW40_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "bwp-BW41",
@@ -1863,7 +1872,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "n/a",
+        "damage": "",
         "text": "Search your deck for a Lightning Energy card and attach it to this Pokémon. Shuffle your deck afterward."
       },
       {
@@ -1884,8 +1893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW41_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bwp-BW42",
@@ -1940,8 +1949,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW42_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bwp-BW43",
@@ -1996,8 +2005,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW43_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "bwp-BW44",
@@ -2048,8 +2057,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW44_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bwp-BW45",
@@ -2069,6 +2078,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Psychic"
     ],
@@ -2080,7 +2092,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to this Pokémon and the Defending Pokémon."
       },
       {
@@ -2101,8 +2113,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW45_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -2128,6 +2140,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Darkness"
     ],
@@ -2156,8 +2171,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW46_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "bwp-BW47",
@@ -2176,6 +2191,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Dragon"
     ],
@@ -2196,7 +2214,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 2,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Discard all basic Fire Energy or all basic Lightning Energy attached to this Pokémon. This attack does 60 damage times the number of Energy cards you discarded."
       }
     ],
@@ -2206,8 +2224,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW47_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -2254,8 +2272,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW48_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "bwp-BW49",
@@ -2310,8 +2328,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 549,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW49_hires.png",
+    "nationalPokedexNumber": 549
   },
   {
     "id": "bwp-BW50",
@@ -2378,8 +2396,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW51_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "bwp-BW52",
@@ -2418,8 +2436,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW52_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -2469,8 +2487,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW53_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "bwp-BW54",
@@ -2519,8 +2537,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW54_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -2567,8 +2585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW55_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -2601,7 +2619,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -2622,8 +2640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW56_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "bwp-BW57",
@@ -2666,7 +2684,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "90x",
+        "damage": "90×",
         "text": "Flip 2 coins. This attack does 90 damage times the number of heads."
       }
     ],
@@ -2676,8 +2694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 612,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW57_hires.png",
+    "nationalPokedexNumber": 612
   },
   {
     "id": "bwp-BW58",
@@ -2707,7 +2725,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2729,8 +2747,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW58_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bwp-BW59",
@@ -2760,7 +2778,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       },
       {
@@ -2782,8 +2800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW59_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bwp-BW60",
@@ -2832,8 +2850,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW60_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bwp-BW61",
@@ -2858,6 +2876,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Water"
     ],
@@ -2880,8 +2901,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW61_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bwp-BW62",
@@ -2902,6 +2923,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Dragon"
     ],
@@ -2936,8 +2960,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW62_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bwp-BW63",
@@ -2958,6 +2982,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Dragon"
     ],
@@ -2992,8 +3019,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW63_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bwp-BW64",
@@ -3022,7 +3049,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Does 50 damage times the number of Special Energy cards in your opponent's discard pile."
       },
       {
@@ -3042,8 +3069,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW64_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "bwp-BW65",
@@ -3071,7 +3098,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3081,8 +3108,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW65_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3129,8 +3156,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW66_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "bwp-BW67",
@@ -3181,8 +3208,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW67_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "bwp-BW68",
@@ -3231,8 +3258,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW68_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "bwp-BW69",
@@ -3281,8 +3308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW69_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "bwp-BW70",
@@ -3333,8 +3360,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW70_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bwp-BW71",
@@ -3383,8 +3410,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW71_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bwp-BW72",
@@ -3437,8 +3464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW72_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bwp-BW73",
@@ -3496,8 +3523,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW73_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "bwp-BW74",
@@ -3551,8 +3578,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW74_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "bwp-BW75",
@@ -3600,8 +3627,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW75_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "bwp-BW76",
@@ -3648,14 +3675,13 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW76_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "bwp-BW77",
     "name": "Pikachu",
     "imageUrl": "https://images.pokemontcg.io/bwp/BW77.png",
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW77_hires.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
     "hp": "60",
@@ -3695,13 +3721,13 @@
         "value": "×2"
       }
     ],
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW77_hires.png",
     "nationalPokedexNumber": 25
   },
   {
     "id": "bwp-BW78",
     "name": "Raichu",
     "imageUrl": "https://images.pokemontcg.io/bwp/BW78.png",
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW78_hires.png",
     "subtype": "Stage 1",
     "supertype": "Pokémon",
     "hp": "100",
@@ -3743,6 +3769,7 @@
         "value": "×2"
       }
     ],
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW78_hires.png",
     "nationalPokedexNumber": 26
   },
   {
@@ -3801,8 +3828,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW79_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "bwp-BW80",
@@ -3852,8 +3879,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW80_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "bwp-BW81",
@@ -3872,6 +3899,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Lightning"
     ],
@@ -3904,8 +3934,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW81_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bwp-BW82",
@@ -3930,6 +3960,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Psychic"
     ],
@@ -3951,8 +3984,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW82_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "bwp-BW83",
@@ -3977,6 +4010,9 @@
     "series": "BW",
     "set": "BW Black Star Promos",
     "setCode": "bwp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Colorless"
     ],
@@ -4006,8 +4042,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW83_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "bwp-BW84",
@@ -4043,7 +4079,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 3 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -4053,8 +4089,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW84_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "bwp-BW85",
@@ -4101,8 +4137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW85_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "bwp-BW86",
@@ -4154,8 +4190,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW86_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "bwp-BW87",
@@ -4210,8 +4246,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW87_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "bwp-BW88",
@@ -4261,8 +4297,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW88_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "bwp-BW89",
@@ -4313,8 +4349,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW89_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "bwp-BW90",
@@ -4363,8 +4399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW90_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "bwp-BW91",
@@ -4401,7 +4437,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 4 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -4411,8 +4447,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW91_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "bwp-BW92",
@@ -4458,8 +4494,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW92_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "bwp-BW93",
@@ -4517,8 +4553,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW93_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "bwp-BW94",
@@ -4566,8 +4602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW94_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4661,8 +4697,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW96_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bwp-BW97",
@@ -4710,8 +4746,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW97_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4764,8 +4800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW98_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "bwp-BW99",
@@ -4816,8 +4852,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW99_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "bwp-BW100",
@@ -4885,7 +4921,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW101_hires.png",
+    "nationalPokedexNumber": 649
   }
 ]
diff --git a/json/cards/Base Set 2.json b/json/cards/Base Set 2.json
index 3fafd9deb..d4586beb4 100644
--- a/json/cards/Base Set 2.json	
+++ b/json/cards/Base Set 2.json	
@@ -46,8 +46,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/1_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "base4-2",
@@ -96,8 +96,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/2_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "base4-3",
@@ -155,8 +155,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/3_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -169,6 +169,10 @@
     "supertype": "Pokémon",
     "level": "76",
     "evolvesFrom": "Charmeleon",
+    "ability": {
+      "name": "Energy Burn",
+      "text": "As often as you like during your turn (before your attack), you may turn all Energy attached to Charizard into R for the rest of the turn. This power can't be used if Charizard is Asleep, Confused, or Paralyzed."
+    },
     "hp": "120",
     "retreatCost": [
       "Colorless",
@@ -210,8 +214,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/4_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "base4-5",
@@ -268,8 +272,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/5_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "base4-6",
@@ -325,8 +329,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/6_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -391,8 +395,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/7_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "base4-8",
@@ -443,8 +447,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/8_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "base4-9",
@@ -498,8 +502,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/9_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -554,8 +558,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/10_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "base4-11",
@@ -567,6 +571,8 @@
     "evolvesFrom": "Nidorino",
     "hp": "90",
     "retreatCost": [
+      "Colorless",
+      "Colorless",
       "Colorless"
     ],
     "number": "11",
@@ -588,7 +594,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage; if tails, this attack does 30 damage plus Nidoking does 10 damage to self."
+        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage; if tails, this attack does 30 damage and Nidoking does 10 damage to itself."
       },
       {
         "name": "Toxic",
@@ -608,8 +614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/11_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "base4-12",
@@ -664,8 +670,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/12_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "base4-13",
@@ -718,8 +724,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/13_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "base4-14",
@@ -774,8 +780,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/14_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "base4-15",
@@ -831,8 +837,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/15_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "base4-16",
@@ -886,8 +892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/16_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "base4-17",
@@ -940,8 +946,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/17_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -993,8 +999,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/18_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "base4-19",
@@ -1052,8 +1058,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/19_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "base4-20",
@@ -1109,8 +1115,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/20_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "base4-21",
@@ -1139,8 +1145,8 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "",
-        "text": "Flip 2 coins. This attack does 30 times number of heads."
+        "damage": "30×",
+        "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
         "name": "Poison Sting",
@@ -1166,8 +1172,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/21_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "base4-22",
@@ -1222,8 +1228,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/22_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1287,8 +1293,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/23_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "base4-24",
@@ -1338,8 +1344,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/24_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1448,8 +1454,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/26_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "base4-27",
@@ -1495,8 +1501,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/27_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "base4-28",
@@ -1554,8 +1560,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/28_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -1610,8 +1616,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/29_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "base4-30",
@@ -1668,8 +1674,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/30_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "base4-31",
@@ -1718,8 +1724,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/31_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "base4-32",
@@ -1770,8 +1776,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/32_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "base4-33",
@@ -1827,8 +1833,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/33_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "base4-34",
@@ -1884,8 +1890,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/34_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "base4-35",
@@ -1938,8 +1944,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/35_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1998,8 +2004,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/36_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "base4-37",
@@ -2049,8 +2055,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/37_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "base4-38",
@@ -2089,8 +2095,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/38_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2144,8 +2150,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/39_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "base4-40",
@@ -2201,8 +2207,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/40_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "base4-41",
@@ -2259,8 +2265,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/41_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "base4-42",
@@ -2300,8 +2306,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/42_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -2354,8 +2360,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/43_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2411,8 +2417,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/44_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -2466,8 +2472,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/45_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "base4-46",
@@ -2521,8 +2527,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/46_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -2577,8 +2583,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/47_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -2636,8 +2642,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/48_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -2696,8 +2702,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/49_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2748,8 +2754,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/50_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -2804,8 +2810,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/51_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2866,8 +2872,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/52_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "base4-53",
@@ -2918,8 +2924,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/53_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2976,8 +2982,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/54_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -3032,8 +3038,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/55_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "base4-56",
@@ -3088,8 +3094,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/56_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "base4-57",
@@ -3141,8 +3147,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/57_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -3203,8 +3209,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/58_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "base4-59",
@@ -3266,8 +3272,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/59_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -3320,8 +3326,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/60_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "base4-61",
@@ -3360,8 +3366,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/61_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -3422,8 +3428,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/62_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "base4-63",
@@ -3475,8 +3481,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/63_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -3529,8 +3535,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/64_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -3569,8 +3575,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/65_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -3621,8 +3627,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/66_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -3665,8 +3671,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/67_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -3708,8 +3714,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/68_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -3761,8 +3767,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/69_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3820,8 +3826,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/70_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -3876,8 +3882,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/71_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -3922,8 +3928,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/72_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -3972,8 +3978,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/73_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -4025,8 +4031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/74_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -4075,8 +4081,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/75_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -4115,8 +4121,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/76_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -4174,8 +4180,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/77_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -4217,8 +4223,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/78_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -4270,8 +4276,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/79_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -4320,8 +4326,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/80_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -4376,8 +4382,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/81_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -4429,8 +4435,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/82_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -4472,8 +4478,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/83_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -4527,8 +4533,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/84_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -4581,8 +4587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/85_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -4631,8 +4637,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/86_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -4684,8 +4690,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/87_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4727,8 +4733,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/88_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -4773,8 +4779,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/89_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4835,8 +4841,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/90_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -4884,8 +4890,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/91_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -4941,8 +4947,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/92_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4994,8 +5000,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/93_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -5050,8 +5056,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base4/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base4/94_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "base4-95",
@@ -5090,8 +5096,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/95_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -5146,8 +5152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/96_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -5199,8 +5205,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/97_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -5242,8 +5248,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/98_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -5286,8 +5292,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/99_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -5319,7 +5325,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "",
+        "damage": "10",
         "text": "Flip a coin. If heads, Defending Pokémon is now Poisoned."
       }
     ],
@@ -5329,8 +5335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/base4/100_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
diff --git a/json/cards/Base.json b/json/cards/Base.json
index 7841861e0..2b47a1b61 100644
--- a/json/cards/Base.json
+++ b/json/cards/Base.json
@@ -46,8 +46,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/1_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "base1-2",
@@ -96,8 +96,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/2_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "base1-3",
@@ -155,8 +155,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/3_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -169,6 +169,10 @@
     "supertype": "Pokémon",
     "level": "76",
     "evolvesFrom": "Charmeleon",
+    "ability": {
+      "name": "Energy Burn",
+      "text": "As often as you like during your turn (before your attack), you may turn all Energy attached to Charizard into R for the rest of the turn. This power can't be used if Charizard is Asleep, Confused, or Paralyzed."
+    },
     "hp": "120",
     "retreatCost": [
       "Colorless",
@@ -210,8 +214,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/4_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "base1-5",
@@ -267,8 +271,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/5_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -333,8 +337,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/6_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "base1-7",
@@ -385,8 +389,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/7_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "base1-8",
@@ -436,8 +440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/8_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "base1-9",
@@ -491,8 +495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/9_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -547,8 +551,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/10_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "base1-11",
@@ -560,6 +564,8 @@
     "evolvesFrom": "Nidorino",
     "hp": "90",
     "retreatCost": [
+      "Colorless",
+      "Colorless",
       "Colorless"
     ],
     "number": "11",
@@ -581,7 +587,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage; if tails, this attack does 30 damage plus Nidoking does 10 damage to self."
+        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage; if tails, this attack does 30 damage and Nidoking does 10 damage to itself."
       },
       {
         "name": "Toxic",
@@ -601,8 +607,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/11_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "base1-12",
@@ -655,8 +661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/12_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "base1-13",
@@ -712,8 +718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/13_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "base1-14",
@@ -767,8 +773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/14_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "base1-15",
@@ -817,8 +823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/15_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "base1-16",
@@ -874,8 +880,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/16_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "base1-17",
@@ -904,8 +910,8 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "",
-        "text": "Flip 2 coins. This attack does 30 times number of heads."
+        "damage": "30×",
+        "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
         "name": "Poison Sting",
@@ -931,8 +937,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/17_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "base1-18",
@@ -987,8 +993,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/18_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1052,8 +1058,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/19_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "base1-20",
@@ -1103,8 +1109,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/20_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1154,8 +1160,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/21_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "base1-22",
@@ -1213,8 +1219,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/22_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -1273,8 +1279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/23_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "base1-24",
@@ -1327,8 +1333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/24_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1387,8 +1393,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/25_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "base1-26",
@@ -1427,8 +1433,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/26_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -1487,8 +1493,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/27_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "base1-28",
@@ -1528,8 +1534,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/28_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -1582,8 +1588,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/29_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1639,8 +1645,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/30_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -1694,8 +1700,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/31_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "base1-32",
@@ -1749,8 +1755,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/32_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -1805,8 +1811,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/33_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -1865,8 +1871,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/34_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -1917,8 +1923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/35_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -1973,8 +1979,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/36_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2031,8 +2037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/37_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2087,8 +2093,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/38_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -2147,8 +2153,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/39_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -2208,8 +2214,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/40_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "base1-41",
@@ -2248,8 +2254,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/41_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -2304,8 +2310,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/42_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2344,8 +2350,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/43_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -2388,8 +2394,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/44_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2431,8 +2437,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/45_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -2484,8 +2490,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/46_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -2540,8 +2546,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/47_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -2586,8 +2592,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/48_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -2636,8 +2642,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/49_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -2686,8 +2692,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/50_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -2730,8 +2736,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/51_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -2773,8 +2779,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/52_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -2826,8 +2832,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/53_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2882,8 +2888,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/54_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -2925,8 +2931,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/55_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -2980,8 +2986,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/56_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3030,8 +3036,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/57_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -3083,8 +3089,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/58_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3126,8 +3132,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/59_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -3180,8 +3186,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/60_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -3226,8 +3232,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/61_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -3275,8 +3281,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/62_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -3328,8 +3334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/63_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -3384,8 +3390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base1/64_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "base1-65",
@@ -3424,8 +3430,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/65_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -3480,8 +3486,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/66_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -3523,8 +3529,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/67_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -3567,8 +3573,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/68_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3600,7 +3606,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "",
+        "damage": "10",
         "text": "Flip a coin. If heads, Defending Pokémon is now Poisoned."
       }
     ],
@@ -3610,8 +3616,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/base1/69_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
diff --git a/json/cards/Black & White.json b/json/cards/Black & White.json
index a44c13fcb..4d69264d5 100644
--- a/json/cards/Black & White.json	
+++ b/json/cards/Black & White.json	
@@ -51,8 +51,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/1_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -100,8 +100,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/2_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -159,8 +159,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 496,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/3_hires.png",
+    "nationalPokedexNumber": 496,
     "evolvesTo": [
       "Serperior"
     ]
@@ -209,8 +209,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 496,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/4_hires.png",
+    "nationalPokedexNumber": 496,
     "evolvesTo": [
       "Serperior"
     ]
@@ -266,8 +266,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/5_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bw1-6",
@@ -318,8 +318,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/6_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bw1-7",
@@ -374,8 +374,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/7_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -435,8 +435,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 512,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/8_hires.png",
+    "nationalPokedexNumber": 512
   },
   {
     "id": "bw1-9",
@@ -480,8 +480,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 548,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/9_hires.png",
+    "nationalPokedexNumber": 548,
     "evolvesTo": [
       "Lilligant"
     ]
@@ -539,8 +539,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 549,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/10_hires.png",
+    "nationalPokedexNumber": 549
   },
   {
     "id": "bw1-11",
@@ -596,8 +596,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 556,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/11_hires.png",
+    "nationalPokedexNumber": 556
   },
   {
     "id": "bw1-12",
@@ -653,8 +653,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 556,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/12_hires.png",
+    "nationalPokedexNumber": 556
   },
   {
     "id": "bw1-13",
@@ -708,8 +708,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 585,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/13_hires.png",
+    "nationalPokedexNumber": 585,
     "evolvesTo": [
       "Sawsbuck"
     ]
@@ -768,8 +768,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 586,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/14_hires.png",
+    "nationalPokedexNumber": 586
   },
   {
     "id": "bw1-15",
@@ -817,8 +817,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 498,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/15_hires.png",
+    "nationalPokedexNumber": 498,
     "evolvesTo": [
       "Pignite"
     ]
@@ -861,8 +861,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 498,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/16_hires.png",
+    "nationalPokedexNumber": 498,
     "evolvesTo": [
       "Pignite"
     ]
@@ -917,8 +917,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 499,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/17_hires.png",
+    "nationalPokedexNumber": 499,
     "evolvesTo": [
       "Emboar"
     ]
@@ -974,8 +974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 499,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/18_hires.png",
+    "nationalPokedexNumber": 499,
     "evolvesTo": [
       "Emboar"
     ]
@@ -1034,8 +1034,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/19_hires.png",
+    "nationalPokedexNumber": 500
   },
   {
     "id": "bw1-20",
@@ -1085,8 +1085,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/20_hires.png",
+    "nationalPokedexNumber": 500
   },
   {
     "id": "bw1-21",
@@ -1135,8 +1135,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/21_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -1189,8 +1189,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/22_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "bw1-23",
@@ -1229,8 +1229,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 554,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/23_hires.png",
+    "nationalPokedexNumber": 554,
     "evolvesTo": [
       "Darmanitan"
     ]
@@ -1282,8 +1282,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 554,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/24_hires.png",
+    "nationalPokedexNumber": 554,
     "evolvesTo": [
       "Darmanitan"
     ]
@@ -1338,8 +1338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 555,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/25_hires.png",
+    "nationalPokedexNumber": 555
   },
   {
     "id": "bw1-26",
@@ -1390,8 +1390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/26_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw1-27",
@@ -1439,8 +1439,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/27_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -1482,8 +1482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/28_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -1537,8 +1537,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 502,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/29_hires.png",
+    "nationalPokedexNumber": 502,
     "evolvesTo": [
       "Samurott"
     ]
@@ -1581,8 +1581,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 502,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/30_hires.png",
+    "nationalPokedexNumber": 502,
     "evolvesTo": [
       "Samurott"
     ]
@@ -1637,8 +1637,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 503,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/31_hires.png",
+    "nationalPokedexNumber": 503
   },
   {
     "id": "bw1-32",
@@ -1685,8 +1685,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 503,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/32_hires.png",
+    "nationalPokedexNumber": 503
   },
   {
     "id": "bw1-33",
@@ -1735,8 +1735,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 515,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/33_hires.png",
+    "nationalPokedexNumber": 515,
     "evolvesTo": [
       "Simipour"
     ]
@@ -1789,8 +1789,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 516,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/34_hires.png",
+    "nationalPokedexNumber": 516
   },
   {
     "id": "bw1-35",
@@ -1829,8 +1829,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 550,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/35_hires.png",
+    "nationalPokedexNumber": 550
   },
   {
     "id": "bw1-36",
@@ -1874,8 +1874,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/36_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -1933,8 +1933,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 581,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/37_hires.png",
+    "nationalPokedexNumber": 581
   },
   {
     "id": "bw1-38",
@@ -1986,8 +1986,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 594,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/38_hires.png",
+    "nationalPokedexNumber": 594
   },
   {
     "id": "bw1-39",
@@ -2039,8 +2039,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 594,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/39_hires.png",
+    "nationalPokedexNumber": 594
   },
   {
     "id": "bw1-40",
@@ -2079,8 +2079,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 522,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/40_hires.png",
+    "nationalPokedexNumber": 522,
     "evolvesTo": [
       "Zebstrika"
     ]
@@ -2121,8 +2121,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 522,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/41_hires.png",
+    "nationalPokedexNumber": 522,
     "evolvesTo": [
       "Zebstrika"
     ]
@@ -2176,8 +2176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 523,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/42_hires.png",
+    "nationalPokedexNumber": 523
   },
   {
     "id": "bw1-43",
@@ -2227,8 +2227,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 523,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/43_hires.png",
+    "nationalPokedexNumber": 523
   },
   {
     "id": "bw1-44",
@@ -2266,8 +2266,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/44_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -2308,8 +2308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/45_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -2361,8 +2361,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 596,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/46_hires.png",
+    "nationalPokedexNumber": 596
   },
   {
     "id": "bw1-47",
@@ -2413,8 +2413,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/47_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw1-48",
@@ -2463,8 +2463,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 517,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/48_hires.png",
+    "nationalPokedexNumber": 517,
     "evolvesTo": [
       "Musharna"
     ]
@@ -2517,8 +2517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 518,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/49_hires.png",
+    "nationalPokedexNumber": 518
   },
   {
     "id": "bw1-50",
@@ -2562,8 +2562,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 527,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/50_hires.png",
+    "nationalPokedexNumber": 527,
     "evolvesTo": [
       "Swoobat"
     ]
@@ -2621,8 +2621,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 528,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/51_hires.png",
+    "nationalPokedexNumber": 528
   },
   {
     "id": "bw1-52",
@@ -2672,8 +2672,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 543,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/52_hires.png",
+    "nationalPokedexNumber": 543,
     "evolvesTo": [
       "Whirlipede"
     ]
@@ -2728,8 +2728,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 544,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/53_hires.png",
+    "nationalPokedexNumber": 544,
     "evolvesTo": [
       "Scolipede"
     ]
@@ -2787,8 +2787,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 545,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/54_hires.png",
+    "nationalPokedexNumber": 545
   },
   {
     "id": "bw1-55",
@@ -2836,8 +2836,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 577,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/55_hires.png",
+    "nationalPokedexNumber": 577,
     "evolvesTo": [
       "Duosion"
     ]
@@ -2889,8 +2889,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 578,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/56_hires.png",
+    "nationalPokedexNumber": 578,
     "evolvesTo": [
       "Reuniclus"
     ]
@@ -2940,8 +2940,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/57_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "bw1-58",
@@ -2980,8 +2980,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 532,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/58_hires.png",
+    "nationalPokedexNumber": 532,
     "evolvesTo": [
       "Gurdurr"
     ]
@@ -3033,8 +3033,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 532,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/59_hires.png",
+    "nationalPokedexNumber": 532,
     "evolvesTo": [
       "Gurdurr"
     ]
@@ -3088,8 +3088,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 533,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/60_hires.png",
+    "nationalPokedexNumber": 533,
     "evolvesTo": [
       "Conkeldurr"
     ]
@@ -3144,8 +3144,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 538,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/61_hires.png",
+    "nationalPokedexNumber": 538
   },
   {
     "id": "bw1-62",
@@ -3193,8 +3193,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 539,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/62_hires.png",
+    "nationalPokedexNumber": 539
   },
   {
     "id": "bw1-63",
@@ -3250,8 +3250,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/63_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -3311,8 +3311,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/64_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -3375,8 +3375,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/65_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "bw1-66",
@@ -3430,8 +3430,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/66_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -3489,8 +3489,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 510,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/67_hires.png",
+    "nationalPokedexNumber": 510
   },
   {
     "id": "bw1-68",
@@ -3534,8 +3534,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/68_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -3594,8 +3594,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 560,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/69_hires.png",
+    "nationalPokedexNumber": 560
   },
   {
     "id": "bw1-70",
@@ -3640,8 +3640,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/70_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -3699,8 +3699,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/71_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "bw1-72",
@@ -3744,8 +3744,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 629,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/72_hires.png",
+    "nationalPokedexNumber": 629,
     "evolvesTo": [
       "Mandibuzz"
     ]
@@ -3804,8 +3804,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 630,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/73_hires.png",
+    "nationalPokedexNumber": 630
   },
   {
     "id": "bw1-74",
@@ -3850,8 +3850,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 599,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/74_hires.png",
+    "nationalPokedexNumber": 599,
     "evolvesTo": [
       "Klang"
     ]
@@ -3911,8 +3911,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 600,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/75_hires.png",
+    "nationalPokedexNumber": 600,
     "evolvesTo": [
       "Klinklang"
     ]
@@ -3969,8 +3969,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 601,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/76_hires.png",
+    "nationalPokedexNumber": 601
   },
   {
     "id": "bw1-77",
@@ -4018,8 +4018,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/77_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -4060,8 +4060,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/78_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -4114,8 +4114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 505,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/79_hires.png",
+    "nationalPokedexNumber": 505
   },
   {
     "id": "bw1-80",
@@ -4162,8 +4162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/80_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -4214,8 +4214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/81_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -4269,8 +4269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 507,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/82_hires.png",
+    "nationalPokedexNumber": 507,
     "evolvesTo": [
       "Stoutland"
     ]
@@ -4327,8 +4327,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 508,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/83_hires.png",
+    "nationalPokedexNumber": 508
   },
   {
     "id": "bw1-84",
@@ -4372,8 +4372,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 519,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/84_hires.png",
+    "nationalPokedexNumber": 519,
     "evolvesTo": [
       "Tranquill"
     ]
@@ -4431,8 +4431,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 520,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/85_hires.png",
+    "nationalPokedexNumber": 520,
     "evolvesTo": [
       "Unfezant"
     ]
@@ -4492,8 +4492,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 521,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/86_hires.png",
+    "nationalPokedexNumber": 521
   },
   {
     "id": "bw1-87",
@@ -4533,8 +4533,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/87_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "bw1-88",
@@ -4572,8 +4572,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw1/88_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -4625,8 +4625,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/89_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "bw1-90",
@@ -4677,8 +4677,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 626,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/90_hires.png",
+    "nationalPokedexNumber": 626
   },
   {
     "id": "bw1-91",
@@ -4730,8 +4730,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 626,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/91_hires.png",
+    "nationalPokedexNumber": 626
   },
   {
     "id": "bw1-92",
@@ -5119,8 +5119,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/113_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw1-114",
@@ -5171,7 +5171,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw1/114_hires.png",
+    "nationalPokedexNumber": 644
   }
 ]
diff --git a/json/cards/Boundaries Crossed.json b/json/cards/Boundaries Crossed.json
index 44bb037b8..1a3795960 100644
--- a/json/cards/Boundaries Crossed.json	
+++ b/json/cards/Boundaries Crossed.json	
@@ -51,8 +51,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/1_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -112,8 +112,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/2_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -128,7 +128,7 @@
     "evolvesFrom": "Gloom",
     "ability": {
       "name": "Allergy Panic",
-      "text": "Apply Weakness for each Pokémon (both yours and your opponent's) as x4 instead.",
+      "text": "Apply Weakness for each Pokémon (both yours and your opponent's) as ×4 instead.",
       "type": "Ability"
     },
     "hp": "140",
@@ -172,8 +172,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/3_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "bw7-4",
@@ -213,7 +213,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 3 coins. This attack does 50 damage times the number of heads. This Pokémon is now Confused."
       }
     ],
@@ -229,8 +229,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/4_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "bw7-5",
@@ -286,8 +286,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/5_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -322,7 +322,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the amount of Grass Energy attached to this Pokémon. This Pokémon can't use Hundred Furious Lashes during your next turn."
       },
       {
@@ -350,8 +350,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/6_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "bw7-7",
@@ -399,8 +399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/7_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -453,8 +453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/8_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "bw7-9",
@@ -508,8 +508,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/9_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "bw7-10",
@@ -557,8 +557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/10_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "bw7-11",
@@ -606,8 +606,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/11_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -650,7 +650,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -660,8 +660,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 496,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/12_hires.png",
+    "nationalPokedexNumber": 496,
     "evolvesTo": [
       "Serperior"
     ]
@@ -694,7 +694,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       },
       {
@@ -715,8 +715,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/13_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bw7-14",
@@ -760,8 +760,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 546,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/14_hires.png",
+    "nationalPokedexNumber": 546,
     "evolvesTo": [
       "Whimsicott"
     ]
@@ -818,8 +818,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 547,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/15_hires.png",
+    "nationalPokedexNumber": 547
   },
   {
     "id": "bw7-16",
@@ -863,8 +863,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 548,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/16_hires.png",
+    "nationalPokedexNumber": 548,
     "evolvesTo": [
       "Lilligant"
     ]
@@ -923,8 +923,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 549,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/17_hires.png",
+    "nationalPokedexNumber": 549
   },
   {
     "id": "bw7-18",
@@ -973,8 +973,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/18_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -1028,8 +1028,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/19_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1088,8 +1088,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/20_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "bw7-21",
@@ -1131,8 +1131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/21_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -1191,8 +1191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/22_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "bw7-23",
@@ -1230,7 +1230,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1240,8 +1240,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/23_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw7-24",
@@ -1289,8 +1289,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 498,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/24_hires.png",
+    "nationalPokedexNumber": 498,
     "evolvesTo": [
       "Pignite"
     ]
@@ -1345,8 +1345,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 499,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/25_hires.png",
+    "nationalPokedexNumber": 499,
     "evolvesTo": [
       "Emboar"
     ]
@@ -1405,8 +1405,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/26_hires.png",
+    "nationalPokedexNumber": 500
   },
   {
     "id": "bw7-27",
@@ -1446,8 +1446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 554,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/27_hires.png",
+    "nationalPokedexNumber": 554,
     "evolvesTo": [
       "Darmanitan"
     ]
@@ -1480,7 +1480,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       },
       {
@@ -1501,8 +1501,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 555,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/28_hires.png",
+    "nationalPokedexNumber": 555
   },
   {
     "id": "bw7-29",
@@ -1546,8 +1546,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/29_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -1601,8 +1601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/30_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -1655,8 +1655,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/31_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "bw7-32",
@@ -1694,8 +1694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/32_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -1738,8 +1738,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/33_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -1788,8 +1788,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/34_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "bw7-35",
@@ -1835,8 +1835,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/35_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "bw7-36",
@@ -1887,8 +1887,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/36_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -1942,8 +1942,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/37_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "bw7-38",
@@ -1991,8 +1991,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/38_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "bw7-39",
@@ -2040,8 +2040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/39_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -2094,8 +2094,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 502,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/40_hires.png",
+    "nationalPokedexNumber": 502,
     "evolvesTo": [
       "Samurott"
     ]
@@ -2152,8 +2152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 503,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/41_hires.png",
+    "nationalPokedexNumber": 503
   },
   {
     "id": "bw7-42",
@@ -2198,8 +2198,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/42_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -2259,8 +2259,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 581,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/43_hires.png",
+    "nationalPokedexNumber": 581
   },
   {
     "id": "bw7-44",
@@ -2301,8 +2301,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 592,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/44_hires.png",
+    "nationalPokedexNumber": 592,
     "evolvesTo": [
       "Jellicent"
     ]
@@ -2353,8 +2353,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 593,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/45_hires.png",
+    "nationalPokedexNumber": 593
   },
   {
     "id": "bw7-46",
@@ -2393,8 +2393,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 615,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/46_hires.png",
+    "nationalPokedexNumber": 615
   },
   {
     "id": "bw7-47",
@@ -2444,8 +2444,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/47_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bw7-48",
@@ -2495,8 +2495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/48_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bw7-49",
@@ -2545,8 +2545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/49_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bw7-50",
@@ -2585,7 +2585,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -2595,8 +2595,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/50_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -2637,8 +2637,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/51_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -2688,8 +2688,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/52_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "bw7-53",
@@ -2740,8 +2740,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/53_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -2799,8 +2799,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/54_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "bw7-55",
@@ -2839,8 +2839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/55_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2881,8 +2881,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 522,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/56_hires.png",
+    "nationalPokedexNumber": 522,
     "evolvesTo": [
       "Zebstrika"
     ]
@@ -2935,8 +2935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 523,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/57_hires.png",
+    "nationalPokedexNumber": 523
   },
   {
     "id": "bw7-58",
@@ -2977,8 +2977,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/58_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "bw7-59",
@@ -3006,7 +3006,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3016,8 +3016,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/59_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3072,8 +3072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/60_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "bw7-61",
@@ -3111,8 +3111,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/61_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -3166,8 +3166,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/62_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -3219,8 +3219,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/63_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "bw7-64",
@@ -3259,8 +3259,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/64_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -3302,8 +3302,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/65_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -3356,8 +3356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/66_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "bw7-67",
@@ -3406,8 +3406,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/67_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "bw7-68",
@@ -3452,8 +3452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 517,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/68_hires.png",
+    "nationalPokedexNumber": 517,
     "evolvesTo": [
       "Musharna"
     ]
@@ -3508,8 +3508,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 518,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/69_hires.png",
+    "nationalPokedexNumber": 518
   },
   {
     "id": "bw7-70",
@@ -3563,8 +3563,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 527,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/70_hires.png",
+    "nationalPokedexNumber": 527,
     "evolvesTo": [
       "Swoobat"
     ]
@@ -3622,8 +3622,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 528,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/71_hires.png",
+    "nationalPokedexNumber": 528
   },
   {
     "id": "bw7-72",
@@ -3668,8 +3668,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 543,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/72_hires.png",
+    "nationalPokedexNumber": 543,
     "evolvesTo": [
       "Whirlipede"
     ]
@@ -3720,8 +3720,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 544,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/73_hires.png",
+    "nationalPokedexNumber": 544,
     "evolvesTo": [
       "Scolipede"
     ]
@@ -3774,8 +3774,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 545,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/74_hires.png",
+    "nationalPokedexNumber": 545
   },
   {
     "id": "bw7-75",
@@ -3823,8 +3823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/75_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -3878,8 +3878,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 575,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/76_hires.png",
+    "nationalPokedexNumber": 575,
     "evolvesTo": [
       "Gothitelle"
     ]
@@ -3931,8 +3931,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/77_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "bw7-78",
@@ -3988,8 +3988,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/78_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -4049,8 +4049,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/79_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "bw7-80",
@@ -4104,8 +4104,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/80_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -4163,8 +4163,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/81_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "bw7-82",
@@ -4204,8 +4204,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/82_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -4262,8 +4262,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/83_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4296,7 +4296,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on this Pokémon."
       }
     ],
@@ -4306,8 +4306,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 557,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/84_hires.png",
+    "nationalPokedexNumber": 557,
     "evolvesTo": [
       "Crustle"
     ]
@@ -4358,8 +4358,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 558,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/85_hires.png",
+    "nationalPokedexNumber": 558
   },
   {
     "id": "bw7-86",
@@ -4397,8 +4397,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 619,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/86_hires.png",
+    "nationalPokedexNumber": 619,
     "evolvesTo": [
       "Mienshao"
     ]
@@ -4439,8 +4439,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 619,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/87_hires.png",
+    "nationalPokedexNumber": 619,
     "evolvesTo": [
       "Mienshao"
     ]
@@ -4484,7 +4484,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "70x",
+        "damage": "70×",
         "text": "Flip 2 coins. This attack does 70 damage times the number of heads."
       }
     ],
@@ -4494,8 +4494,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 620,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/88_hires.png",
+    "nationalPokedexNumber": 620
   },
   {
     "id": "bw7-89",
@@ -4555,8 +4555,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/89_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "bw7-90",
@@ -4600,8 +4600,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/90_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -4660,8 +4660,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 510,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/91_hires.png",
+    "nationalPokedexNumber": 510
   },
   {
     "id": "bw7-92",
@@ -4715,8 +4715,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 629,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/92_hires.png",
+    "nationalPokedexNumber": 629,
     "evolvesTo": [
       "Mandibuzz"
     ]
@@ -4761,7 +4761,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "80x",
+        "damage": "80×",
         "text": "Flip 2 coins. This attack does 80 damage times the number of heads."
       }
     ],
@@ -4777,8 +4777,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 630,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/93_hires.png",
+    "nationalPokedexNumber": 630
   },
   {
     "id": "bw7-94",
@@ -4836,8 +4836,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/94_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "bw7-95",
@@ -4893,8 +4893,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/95_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "bw7-96",
@@ -4950,8 +4950,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/96_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "bw7-97",
@@ -4997,8 +4997,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 599,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/97_hires.png",
+    "nationalPokedexNumber": 599,
     "evolvesTo": [
       "Klang"
     ]
@@ -5030,7 +5030,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -5051,8 +5051,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/98_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -5102,8 +5102,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/99_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "bw7-100",
@@ -5155,8 +5155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/100_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw7-101",
@@ -5213,8 +5213,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/101_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw7-102",
@@ -5266,8 +5266,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/102_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw7-103",
@@ -5324,8 +5324,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/103_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw7-104",
@@ -5363,8 +5363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/104_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -5414,8 +5414,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/105_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "bw7-106",
@@ -5454,8 +5454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/106_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -5503,8 +5503,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/107_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "bw7-108",
@@ -5536,8 +5536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/108_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "bw7-109",
@@ -5570,7 +5570,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       },
       {
@@ -5592,8 +5592,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/109_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "bw7-110",
@@ -5631,8 +5631,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/110_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -5679,8 +5679,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/111_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "bw7-112",
@@ -5724,8 +5724,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/112_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -5766,7 +5766,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -5776,8 +5776,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/113_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -5819,7 +5819,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -5829,8 +5829,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/114_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "bw7-115",
@@ -5869,8 +5869,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/115_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "bw7-116",
@@ -5918,8 +5918,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/116_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -5972,8 +5972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/117_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/117_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "bw7-118",
@@ -6011,8 +6011,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/118_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -6064,8 +6064,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 505,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/119_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/119_hires.png",
+    "nationalPokedexNumber": 505
   },
   {
     "id": "bw7-120",
@@ -6113,8 +6113,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/120_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -6167,8 +6167,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 507,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/121_hires.png",
+    "nationalPokedexNumber": 507,
     "evolvesTo": [
       "Stoutland"
     ]
@@ -6219,8 +6219,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 508,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/122_hires.png",
+    "nationalPokedexNumber": 508
   },
   {
     "id": "bw7-123",
@@ -6265,8 +6265,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 519,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/123_hires.png",
+    "nationalPokedexNumber": 519,
     "evolvesTo": [
       "Tranquill"
     ]
@@ -6316,8 +6316,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 520,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw7/124_hires.png",
+    "nationalPokedexNumber": 520,
     "evolvesTo": [
       "Unfezant"
     ]
@@ -6377,8 +6377,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 521,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/125_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/125_hires.png",
+    "nationalPokedexNumber": 521
   },
   {
     "id": "bw7-126",
@@ -6423,8 +6423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/126_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/126_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "bw7-127",
@@ -6716,8 +6716,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/141_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/141_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "bw7-142",
@@ -6766,8 +6766,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/142_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/142_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bw7-143",
@@ -6816,8 +6816,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/143_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/143_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "bw7-144",
@@ -6877,8 +6877,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/144_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/144_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "bw7-145",
@@ -6935,8 +6935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/145_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw7-146",
@@ -6993,8 +6993,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/146_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw7-147",
@@ -7101,8 +7101,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/150_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "bw7-151",
@@ -7155,8 +7155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/151_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/151_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw7-152",
@@ -7202,8 +7202,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/152_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw7/152_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "bw7-153",
diff --git a/json/cards/Call of Legends.json b/json/cards/Call of Legends.json
index 6e4d3aa1b..07173a0d1 100644
--- a/json/cards/Call of Legends.json	
+++ b/json/cards/Call of Legends.json	
@@ -47,8 +47,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/1_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "col1-2",
@@ -88,8 +88,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/2_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "col1-3",
@@ -138,8 +138,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/3_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "col1-4",
@@ -188,8 +188,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/4_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "col1-5",
@@ -248,8 +248,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/5_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "col1-6",
@@ -293,8 +293,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/6_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "col1-7",
@@ -355,8 +355,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/7_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "col1-8",
@@ -384,7 +384,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -405,8 +405,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/8_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "col1-9",
@@ -467,8 +467,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/9_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "col1-10",
@@ -523,8 +523,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/10_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "col1-11",
@@ -567,8 +567,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/11_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "col1-12",
@@ -612,8 +612,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/12_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "col1-13",
@@ -667,8 +667,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/13_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "col1-14",
@@ -719,8 +719,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/14_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "col1-15",
@@ -781,8 +781,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/15_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "col1-16",
@@ -814,7 +814,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard the top 3 cards from your deck. This attack does 50 damage times the number of Energy cards you discarded."
       },
       {
@@ -836,8 +836,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/16_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "col1-17",
@@ -883,8 +883,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/17_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "col1-18",
@@ -934,8 +934,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/18_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "col1-19",
@@ -978,8 +978,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/19_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "col1-20",
@@ -1027,8 +1027,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/20_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "col1-21",
@@ -1072,8 +1072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/21_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "col1-22",
@@ -1128,8 +1128,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/22_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "col1-23",
@@ -1185,8 +1185,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/23_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "col1-24",
@@ -1220,8 +1220,8 @@
         "text": "Shuffle your hand into your deck, then draw 6 cards. Cleffa is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 173,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/24_hires.png",
+    "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
     ]
@@ -1278,8 +1278,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/25_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "col1-26",
@@ -1333,8 +1333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/26_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "col1-27",
@@ -1391,8 +1391,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/27_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "col1-28",
@@ -1447,8 +1447,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/28_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "col1-29",
@@ -1492,8 +1492,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/29_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "col1-30",
@@ -1547,8 +1547,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/30_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "col1-31",
@@ -1603,8 +1603,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/31_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "col1-32",
@@ -1650,8 +1650,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/32_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "col1-33",
@@ -1706,8 +1706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/33_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "col1-34",
@@ -1766,8 +1766,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/34_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "col1-35",
@@ -1818,8 +1818,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/35_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "col1-36",
@@ -1853,8 +1853,8 @@
         "text": "This attack's damage isn't affected by Weakness or Resistance. Tyrogue is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 236,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/36_hires.png",
+    "nationalPokedexNumber": 236,
     "evolvesTo": [
       "Hitmonlee",
       "Hitmonchan",
@@ -1911,8 +1911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/37_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "col1-38",
@@ -1962,8 +1962,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/38_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "col1-39",
@@ -2013,8 +2013,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/39_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "col1-40",
@@ -2071,8 +2071,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/40_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -2127,8 +2127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/41_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -2176,7 +2176,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "70x",
+        "damage": "70×",
         "text": "Flip 2 coins. This attack does 70 damage times the number of heads."
       }
     ],
@@ -2192,8 +2192,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/42_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "col1-43",
@@ -2249,8 +2249,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/43_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -2303,8 +2303,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/44_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "col1-45",
@@ -2357,8 +2357,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/45_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "col1-46",
@@ -2392,8 +2392,8 @@
         "text": "The Defending Pokémon is now Burned. Magby is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/46_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -2430,8 +2430,8 @@
         "text": "Put the top card of your opponent's deck in the Lost Zone. Mime Jr. is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 439,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/47_hires.png",
+    "nationalPokedexNumber": 439
   },
   {
     "id": "col1-48",
@@ -2488,8 +2488,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/48_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -2543,8 +2543,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/49_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2585,8 +2585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/50_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -2638,8 +2638,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/51_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "col1-52",
@@ -2690,8 +2690,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/52_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "col1-53",
@@ -2745,8 +2745,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/53_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -2796,8 +2796,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/54_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -2838,8 +2838,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/55_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -2890,8 +2890,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/56_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2949,8 +2949,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/57_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "col1-58",
@@ -3000,8 +3000,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/58_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "col1-59",
@@ -3045,8 +3045,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/59_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3097,8 +3097,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/60_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3139,8 +3139,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/61_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3191,8 +3191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/62_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -3239,8 +3239,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/63_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3298,8 +3298,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/64_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "col1-65",
@@ -3352,8 +3352,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/65_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -3407,8 +3407,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/66_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3464,8 +3464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/67_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -3507,8 +3507,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/68_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3561,8 +3561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/69_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "col1-70",
@@ -3601,8 +3601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/70_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -3655,8 +3655,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/71_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -3715,8 +3715,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/72_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -3757,8 +3757,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/73_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -3802,8 +3802,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/74_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -3854,8 +3854,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/col1/75_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -4221,8 +4221,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL1_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "col1-SL2",
@@ -4271,8 +4271,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL2_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "col1-SL3",
@@ -4318,8 +4318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL3_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "col1-SL4",
@@ -4363,8 +4363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL4_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "col1-SL5",
@@ -4425,8 +4425,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL5_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "col1-SL6",
@@ -4470,8 +4470,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL6_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "col1-SL7",
@@ -4532,8 +4532,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL7_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "col1-SL8",
@@ -4576,8 +4576,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL8_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "col1-SL9",
@@ -4629,8 +4629,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL9_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "col1-SL10",
@@ -4678,8 +4678,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL10_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "col1-SL11",
@@ -4725,7 +4725,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/col1/SL11_hires.png",
+    "nationalPokedexNumber": 245
   }
 ]
diff --git a/json/cards/Crystal Guardians.json b/json/cards/Crystal Guardians.json
index a2822e320..1ca1568a0 100644
--- a/json/cards/Crystal Guardians.json	
+++ b/json/cards/Crystal Guardians.json	
@@ -48,8 +48,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/1_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "ex14-2",
@@ -111,8 +111,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/2_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "ex14-3",
@@ -169,8 +169,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/3_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex14-4",
@@ -222,8 +222,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/4_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ex14-5",
@@ -279,8 +279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/5_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "ex14-6",
@@ -337,8 +337,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/6_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "ex14-7",
@@ -385,8 +385,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/7_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "ex14-8",
@@ -443,8 +443,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/8_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex14-9",
@@ -498,8 +498,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/9_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "ex14-10",
@@ -542,8 +542,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/10_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "ex14-11",
@@ -594,8 +594,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 317,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/11_hires.png",
+    "nationalPokedexNumber": 317
   },
   {
     "id": "ex14-12",
@@ -648,8 +648,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/12_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "ex14-13",
@@ -704,8 +704,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/13_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "ex14-14",
@@ -752,8 +752,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/14_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "ex14-15",
@@ -808,8 +808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/15_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "ex14-16",
@@ -858,8 +858,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/16_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -924,8 +924,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/17_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -979,8 +979,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/18_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "ex14-19",
@@ -1037,8 +1037,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/19_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -1078,7 +1078,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play (both yours and your opponent's), excluding Grumpig."
       }
     ],
@@ -1088,8 +1088,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/20_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "ex14-21",
@@ -1121,8 +1121,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 174,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/21_hires.png",
+    "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
     ]
@@ -1182,8 +1182,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/22_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "ex14-23",
@@ -1234,8 +1234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/23_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -1288,8 +1288,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/24_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -1348,8 +1348,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/25_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "ex14-26",
@@ -1411,8 +1411,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/26_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "ex14-27",
@@ -1459,8 +1459,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/27_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "ex14-28",
@@ -1518,8 +1518,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/28_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "ex14-29",
@@ -1570,8 +1570,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/29_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1625,8 +1625,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/30_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1681,8 +1681,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/31_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1741,8 +1741,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/32_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -1794,8 +1794,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/33_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -1849,8 +1849,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/34_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -1904,8 +1904,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/35_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -1965,8 +1965,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/36_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2020,8 +2020,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/37_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -2075,8 +2075,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/38_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -2135,8 +2135,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/39_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -2193,8 +2193,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/40_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -2245,8 +2245,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/41_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -2300,8 +2300,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/42_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2354,8 +2354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/43_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2386,7 +2386,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Aron."
       }
     ],
@@ -2402,8 +2402,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/44_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2453,8 +2453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/45_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2505,8 +2505,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/46_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2557,8 +2557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/47_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -2589,7 +2589,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Charmander."
       },
       {
@@ -2609,8 +2609,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/48_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -2661,8 +2661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/49_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -2713,8 +2713,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/50_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -2770,8 +2770,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/51_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -2827,8 +2827,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/52_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2869,8 +2869,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/53_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -2911,8 +2911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/54_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -2959,8 +2959,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/55_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -3011,8 +3011,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/56_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -3058,8 +3058,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/57_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -3110,8 +3110,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/58_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -3153,8 +3153,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/59_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3195,8 +3195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/60_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3243,8 +3243,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/61_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -3275,7 +3275,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to the Defending Pokémon."
       },
       {
@@ -3295,8 +3295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/62_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3348,8 +3348,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/63_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -3395,8 +3395,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/64_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -3437,8 +3437,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/65_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -3479,8 +3479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/66_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -3537,8 +3537,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/67_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -3594,8 +3594,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/68_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -3647,8 +3647,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/69_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -3695,8 +3695,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex14/70_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -4102,8 +4102,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/89_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "ex14-90",
@@ -4160,8 +4160,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/90_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex14-91",
@@ -4196,7 +4196,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Search your discard pile for all Energy cards. This attack does 10 damage times the number of Energy cards you find there. Show them to your opponent, and put them on top of your deck. Shuffle your deck afterward."
       },
       {
@@ -4217,8 +4217,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/91_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "ex14-92",
@@ -4280,8 +4280,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/92_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "ex14-93",
@@ -4331,8 +4331,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/93_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "ex14-94",
@@ -4385,8 +4385,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/94_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "ex14-95",
@@ -4436,8 +4436,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/95_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "ex14-96",
@@ -4492,8 +4492,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/96_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "ex14-97",
@@ -4556,8 +4556,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/97_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex14-98",
@@ -4609,8 +4609,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/98_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "ex14-99",
@@ -4662,8 +4662,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/99_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "ex14-100",
@@ -4709,7 +4709,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex14/100_hires.png",
+    "nationalPokedexNumber": 251
   }
 ]
diff --git a/json/cards/Dark Explorers.json b/json/cards/Dark Explorers.json
index 9a747d119..cc2febdd4 100644
--- a/json/cards/Dark Explorers.json	
+++ b/json/cards/Dark Explorers.json	
@@ -53,8 +53,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/1_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -116,8 +116,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/2_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -176,8 +176,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/3_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "bw5-4",
@@ -217,8 +217,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/4_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -277,8 +277,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/5_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "bw5-6",
@@ -333,8 +333,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/6_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "bw5-7",
@@ -384,8 +384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 557,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/7_hires.png",
+    "nationalPokedexNumber": 557,
     "evolvesTo": [
       "Crustle"
     ]
@@ -441,8 +441,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 558,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/8_hires.png",
+    "nationalPokedexNumber": 558
   },
   {
     "id": "bw5-9",
@@ -491,8 +491,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 588,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/9_hires.png",
+    "nationalPokedexNumber": 588,
     "evolvesTo": [
       "Escavalier"
     ]
@@ -536,8 +536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 616,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/10_hires.png",
+    "nationalPokedexNumber": 616,
     "evolvesTo": [
       "Accelgor"
     ]
@@ -586,8 +586,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 617,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/11_hires.png",
+    "nationalPokedexNumber": 617
   },
   {
     "id": "bw5-12",
@@ -637,8 +637,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/12_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "bw5-13",
@@ -693,8 +693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/13_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "bw5-14",
@@ -733,8 +733,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/14_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -785,8 +785,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/15_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -818,7 +818,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -839,8 +839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/16_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -895,8 +895,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/17_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "bw5-18",
@@ -946,8 +946,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/18_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "bw5-19",
@@ -996,8 +996,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 631,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/19_hires.png",
+    "nationalPokedexNumber": 631
   },
   {
     "id": "bw5-20",
@@ -1049,8 +1049,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/20_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -1092,8 +1092,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/21_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -1144,8 +1144,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/22_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "bw5-23",
@@ -1195,8 +1195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/23_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -1247,8 +1247,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/24_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "bw5-25",
@@ -1299,8 +1299,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/25_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "bw5-26",
@@ -1356,8 +1356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/26_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "bw5-27",
@@ -1385,7 +1385,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -1395,8 +1395,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/27_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -1440,7 +1440,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1450,8 +1450,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 394,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/28_hires.png",
+    "nationalPokedexNumber": 394,
     "evolvesTo": [
       "Empoleon"
     ]
@@ -1489,7 +1489,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play (both yours and your opponent's)."
       }
     ],
@@ -1499,8 +1499,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/29_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "bw5-30",
@@ -1549,8 +1549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/30_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "bw5-31",
@@ -1589,8 +1589,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 535,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/31_hires.png",
+    "nationalPokedexNumber": 535,
     "evolvesTo": [
       "Palpitoad"
     ]
@@ -1634,8 +1634,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 536,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/32_hires.png",
+    "nationalPokedexNumber": 536,
     "evolvesTo": [
       "Seismitoad"
     ]
@@ -1666,7 +1666,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -1676,8 +1676,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 582,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/33_hires.png",
+    "nationalPokedexNumber": 582,
     "evolvesTo": [
       "Vanillish"
     ]
@@ -1709,7 +1709,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -1730,8 +1730,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 583,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/34_hires.png",
+    "nationalPokedexNumber": 583,
     "evolvesTo": [
       "Vanilluxe"
     ]
@@ -1779,8 +1779,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/35_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -1839,8 +1839,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 581,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/36_hires.png",
+    "nationalPokedexNumber": 581
   },
   {
     "id": "bw5-37",
@@ -1877,7 +1877,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 4 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -1887,8 +1887,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/37_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "bw5-38",
@@ -1941,8 +1941,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/38_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "bw5-39",
@@ -1989,8 +1989,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/39_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "bw5-40",
@@ -2037,8 +2037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/40_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "bw5-41",
@@ -2086,8 +2086,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/41_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -2128,8 +2128,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/42_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -2161,7 +2161,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2181,8 +2181,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 596,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/43_hires.png",
+    "nationalPokedexNumber": 596
   },
   {
     "id": "bw5-44",
@@ -2220,8 +2220,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 602,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/44_hires.png",
+    "nationalPokedexNumber": 602,
     "evolvesTo": [
       "Eelektrik"
     ]
@@ -2262,8 +2262,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 602,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/45_hires.png",
+    "nationalPokedexNumber": 602,
     "evolvesTo": [
       "Eelektrik"
     ]
@@ -2317,8 +2317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 603,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/46_hires.png",
+    "nationalPokedexNumber": 603,
     "evolvesTo": [
       "Eelektross"
     ]
@@ -2376,8 +2376,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 604,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/47_hires.png",
+    "nationalPokedexNumber": 604
   },
   {
     "id": "bw5-48",
@@ -2423,8 +2423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/48_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "bw5-49",
@@ -2475,8 +2475,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/49_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "bw5-50",
@@ -2530,8 +2530,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 527,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/50_hires.png",
+    "nationalPokedexNumber": 527,
     "evolvesTo": [
       "Swoobat"
     ]
@@ -2572,8 +2572,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 562,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/51_hires.png",
+    "nationalPokedexNumber": 562,
     "evolvesTo": [
       "Cofagrigus"
     ]
@@ -2607,7 +2607,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Discard as many Pokémon Tool cards as you like from your hand. This attack does 40 damage times the number of cards you discarded."
       },
       {
@@ -2627,8 +2627,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 563,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/52_hires.png",
+    "nationalPokedexNumber": 563
   },
   {
     "id": "bw5-53",
@@ -2676,8 +2676,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/53_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "bw5-54",
@@ -2739,8 +2739,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/54_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "bw5-55",
@@ -2786,8 +2786,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 529,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/55_hires.png",
+    "nationalPokedexNumber": 529,
     "evolvesTo": [
       "Excadrill"
     ]
@@ -2847,8 +2847,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/56_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "bw5-57",
@@ -2910,8 +2910,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/57_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "bw5-58",
@@ -2960,8 +2960,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 532,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/58_hires.png",
+    "nationalPokedexNumber": 532,
     "evolvesTo": [
       "Gurdurr"
     ]
@@ -3005,7 +3005,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip 2 coins. This attack does 60 damage times the number of heads."
       }
     ],
@@ -3015,8 +3015,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 533,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/59_hires.png",
+    "nationalPokedexNumber": 533,
     "evolvesTo": [
       "Conkeldurr"
     ]
@@ -3077,8 +3077,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/60_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "bw5-61",
@@ -3135,8 +3135,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/61_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "bw5-62",
@@ -3177,8 +3177,8 @@
         "text": "Put 2 Item cards from your discard pile into your hand."
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/62_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "bw5-63",
@@ -3233,8 +3233,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/63_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "bw5-64",
@@ -3290,8 +3290,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/64_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -3354,8 +3354,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/65_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -3403,7 +3403,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Does 40 damage times the number of Prize cards you have taken."
       }
     ],
@@ -3419,8 +3419,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/66_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "bw5-67",
@@ -3465,8 +3465,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/67_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -3527,8 +3527,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 560,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/68_hires.png",
+    "nationalPokedexNumber": 560
   },
   {
     "id": "bw5-69",
@@ -3582,8 +3582,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/69_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -3640,8 +3640,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/70_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -3675,7 +3675,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Darkness Pokémon you have in play."
       },
       {
@@ -3685,7 +3685,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of damage counters on this Pokémon."
       }
     ],
@@ -3701,8 +3701,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/71_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "bw5-72",
@@ -3759,8 +3759,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/72_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "bw5-73",
@@ -3804,8 +3804,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 629,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/73_hires.png",
+    "nationalPokedexNumber": 629,
     "evolvesTo": [
       "Mandibuzz"
     ]
@@ -3866,8 +3866,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 589,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/74_hires.png",
+    "nationalPokedexNumber": 589
   },
   {
     "id": "bw5-75",
@@ -3914,8 +3914,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 599,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/75_hires.png",
+    "nationalPokedexNumber": 599,
     "evolvesTo": [
       "Klang"
     ]
@@ -3977,8 +3977,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 600,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/76_hires.png",
+    "nationalPokedexNumber": 600,
     "evolvesTo": [
       "Klinklang"
     ]
@@ -4041,8 +4041,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 601,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/77_hires.png",
+    "nationalPokedexNumber": 601
   },
   {
     "id": "bw5-78",
@@ -4098,8 +4098,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/78_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -4160,8 +4160,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/79_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "bw5-80",
@@ -4212,8 +4212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/80_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -4246,7 +4246,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -4256,8 +4256,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/81_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -4308,8 +4308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/82_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "bw5-83",
@@ -4347,8 +4347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/83_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4406,8 +4406,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/84_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4471,8 +4471,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/85_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "bw5-86",
@@ -4520,8 +4520,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/86_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -4574,8 +4574,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 507,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw5/87_hires.png",
+    "nationalPokedexNumber": 507,
     "evolvesTo": [
       "Stoutland"
     ]
@@ -4633,8 +4633,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 508,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/88_hires.png",
+    "nationalPokedexNumber": 508
   },
   {
     "id": "bw5-89",
@@ -4683,8 +4683,8 @@
         "text": "Flip 2 coins. If both of them are heads, the Defending Pokémon is now Paralyzed. If both of them are tails, this attack does nothing."
       }
     ],
-    "nationalPokedexNumber": 612,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/89_hires.png",
+    "nationalPokedexNumber": 612
   },
   {
     "id": "bw5-90",
@@ -4743,8 +4743,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/90_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bw5-91",
@@ -5003,8 +5003,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/103_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "bw5-104",
@@ -5060,8 +5060,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/104_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "bw5-105",
@@ -5114,8 +5114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/105_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "bw5-106",
@@ -5177,8 +5177,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/106_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "bw5-107",
@@ -5233,8 +5233,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/107_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "bw5-108",
@@ -5293,8 +5293,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/108_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bw5-109",
@@ -5342,8 +5342,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/109_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "bw5-110",
@@ -5390,8 +5390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 567,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw5/110_hires.png",
+    "nationalPokedexNumber": 567
   },
   {
     "id": "bw5-111",
diff --git a/json/cards/Delta Species.json b/json/cards/Delta Species.json
index 7dc40804a..9f2d2bc64 100644
--- a/json/cards/Delta Species.json	
+++ b/json/cards/Delta Species.json	
@@ -44,8 +44,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/1_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "ex11-2",
@@ -97,8 +97,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/2_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ex11-3",
@@ -170,8 +170,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/3_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "ex11-4",
@@ -220,8 +220,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/4_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "ex11-5",
@@ -273,8 +273,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/5_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ex11-6",
@@ -335,8 +335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/6_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "ex11-7",
@@ -396,8 +396,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/7_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ex11-8",
@@ -468,8 +468,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/8_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "ex11-9",
@@ -541,8 +541,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/9_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "ex11-10",
@@ -597,8 +597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/10_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "ex11-11",
@@ -655,8 +655,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/11_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "ex11-12",
@@ -694,7 +694,7 @@
           "Metal"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the total amount of Energy attached to Mewtwo and the Defending Pokémon."
       }
     ],
@@ -704,8 +704,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/12_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ex11-13",
@@ -744,7 +744,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to Rayquaza."
       },
       {
@@ -776,8 +776,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/13_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex11-14",
@@ -843,8 +843,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/14_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "ex11-15",
@@ -898,8 +898,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/15_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ex11-16",
@@ -950,8 +950,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/16_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ex11-17",
@@ -1006,8 +1006,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/17_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ex11-18",
@@ -1061,8 +1061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/18_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ex11-19",
@@ -1118,8 +1118,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/19_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "ex11-20",
@@ -1162,8 +1162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 298,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/20_hires.png",
+    "nationalPokedexNumber": 298,
     "evolvesTo": [
       "Marill"
     ]
@@ -1206,8 +1206,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/21_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ex11-22",
@@ -1256,8 +1256,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/22_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1314,8 +1314,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/23_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "ex11-24",
@@ -1359,7 +1359,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Darkness Pokémon and Metal Pokémon you have in play."
       }
     ],
@@ -1375,8 +1375,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/24_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex11-25",
@@ -1420,8 +1420,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/25_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -1469,8 +1469,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/26_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex11-27",
@@ -1530,8 +1530,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/27_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "ex11-28",
@@ -1576,8 +1576,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/28_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "ex11-29",
@@ -1621,8 +1621,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/29_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex11-30",
@@ -1676,8 +1676,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/30_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ex11-31",
@@ -1722,8 +1722,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/31_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex11-32",
@@ -1776,8 +1776,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/32_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "ex11-33",
@@ -1833,8 +1833,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/33_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "ex11-34",
@@ -1877,8 +1877,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/34_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex11-35",
@@ -1921,8 +1921,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/35_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-36",
@@ -1966,8 +1966,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/36_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-37",
@@ -2011,8 +2011,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/37_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-38",
@@ -2055,8 +2055,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/38_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-39",
@@ -2100,8 +2100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/39_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-40",
@@ -2145,8 +2145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/40_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-41",
@@ -2176,7 +2176,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2207,8 +2207,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/41_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -2262,8 +2262,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/42_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -2315,8 +2315,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/43_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -2374,8 +2374,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/44_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "ex11-45",
@@ -2428,8 +2428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/45_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "ex11-46",
@@ -2480,8 +2480,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/46_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -2533,8 +2533,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/47_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -2595,8 +2595,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/48_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2657,8 +2657,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/49_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -2706,8 +2706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/50_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "ex11-51",
@@ -2754,8 +2754,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/51_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2804,8 +2804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/52_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "ex11-53",
@@ -2866,8 +2866,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/53_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2925,8 +2925,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/54_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2952,6 +2952,9 @@
     "series": "EX",
     "set": "Delta Species",
     "setCode": "ex11",
+    "types": [
+      "Metal"
+    ],
     "attacks": [
       {
         "name": "Cry for Help",
@@ -2985,11 +2988,8 @@
         "value": "-30"
       }
     ],
-    "types": [
-      "Metal"
-    ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/55_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ex11-56",
@@ -3033,8 +3033,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/56_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "ex11-57",
@@ -3082,8 +3082,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/57_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -3104,6 +3104,9 @@
     "series": "EX",
     "set": "Delta Species",
     "setCode": "ex11",
+    "types": [
+      "Fire"
+    ],
     "attacks": [
       {
         "name": "Ember",
@@ -3132,11 +3135,8 @@
         "value": "-30"
       }
     ],
-    "types": [
-      "Fire"
-    ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/58_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -3189,8 +3189,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/59_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -3240,8 +3240,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/60_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -3288,8 +3288,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/61_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-62",
@@ -3333,8 +3333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/62_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-63",
@@ -3378,8 +3378,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/63_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-64",
@@ -3423,8 +3423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/64_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex11-65",
@@ -3482,8 +3482,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/65_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -3534,8 +3534,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/66_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -3586,8 +3586,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/67_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -3628,8 +3628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/68_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3687,8 +3687,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/69_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3745,8 +3745,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/70_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3790,8 +3790,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/71_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -3842,8 +3842,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/72_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3893,8 +3893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/73_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -3950,8 +3950,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/74_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3992,8 +3992,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/75_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -4044,8 +4044,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/76_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -4095,8 +4095,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/77_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -4137,8 +4137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/78_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -4195,8 +4195,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/79_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -4238,8 +4238,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/80_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -4289,8 +4289,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/81_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -4341,8 +4341,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/82_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -4393,8 +4393,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/83_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -4446,8 +4446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/84_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4497,8 +4497,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/85_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4545,8 +4545,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/86_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -4587,8 +4587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/87_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -4609,6 +4609,9 @@
     "series": "EX",
     "set": "Delta Species",
     "setCode": "ex11",
+    "types": [
+      "Grass"
+    ],
     "attacks": [
       {
         "name": "Poison Fang",
@@ -4626,11 +4629,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Grass"
-    ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex11/88_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -5053,8 +5053,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/108_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ex11-109",
@@ -5117,8 +5117,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/109_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ex11-110",
@@ -5178,8 +5178,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/110_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ex11-111",
@@ -5235,8 +5235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/111_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "ex11-112",
@@ -5292,8 +5292,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/112_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "ex11-113",
@@ -5355,8 +5355,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/113_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "ex11-114",
@@ -5402,7 +5402,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex11/114_hires.png",
+    "nationalPokedexNumber": 184
   }
 ]
diff --git a/json/cards/Deoxys.json b/json/cards/Deoxys.json
index 61613900b..da553a87a 100644
--- a/json/cards/Deoxys.json
+++ b/json/cards/Deoxys.json
@@ -58,8 +58,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/1_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "ex8-2",
@@ -114,8 +114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/2_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "ex8-3",
@@ -165,8 +165,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/3_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "ex8-4",
@@ -217,8 +217,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/4_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex8-5",
@@ -263,8 +263,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/5_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex8-6",
@@ -326,8 +326,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/6_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "ex8-7",
@@ -383,8 +383,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/7_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -427,7 +427,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of damage counters on all of your Magikarp."
       },
       {
@@ -449,8 +449,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/8_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ex8-9",
@@ -500,8 +500,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/9_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "ex8-10",
@@ -547,7 +547,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play (both yours and your opponent's), excluding Ludicolo."
       }
     ],
@@ -557,8 +557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/10_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "ex8-11",
@@ -604,8 +604,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/11_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "ex8-12",
@@ -657,8 +657,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/12_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex8-13",
@@ -708,8 +708,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/13_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -747,8 +747,8 @@
         "text": "Put 2 damage counters on the Defending Pokémon. If the Defending Pokémon is Pokémon-ex, put 4 damage counters instead."
       }
     ],
-    "nationalPokedexNumber": 292,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/14_hires.png",
+    "nationalPokedexNumber": 292
   },
   {
     "id": "ex8-15",
@@ -807,8 +807,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/15_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "ex8-16",
@@ -852,8 +852,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/16_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex8-17",
@@ -898,8 +898,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/17_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex8-18",
@@ -943,8 +943,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/18_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex8-19",
@@ -991,8 +991,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/19_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "ex8-20",
@@ -1049,8 +1049,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/20_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ex8-21",
@@ -1106,8 +1106,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/21_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "ex8-22",
@@ -1151,8 +1151,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/22_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex8-23",
@@ -1204,8 +1204,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/23_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "ex8-24",
@@ -1251,8 +1251,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/24_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "ex8-25",
@@ -1298,8 +1298,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/25_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex8-26",
@@ -1358,8 +1358,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/26_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ex8-27",
@@ -1414,8 +1414,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/27_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "ex8-28",
@@ -1466,8 +1466,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/28_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "ex8-29",
@@ -1524,8 +1524,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/29_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "ex8-30",
@@ -1575,8 +1575,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/30_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "ex8-31",
@@ -1618,8 +1618,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/31_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1678,8 +1678,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/32_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "ex8-33",
@@ -1724,8 +1724,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/33_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -1773,8 +1773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/34_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -1815,8 +1815,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/35_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -1872,8 +1872,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/36_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "ex8-37",
@@ -1924,8 +1924,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/37_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ex8-38",
@@ -1981,8 +1981,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/38_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex8-39",
@@ -2029,8 +2029,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/39_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "ex8-40",
@@ -2082,8 +2082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/40_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -2133,8 +2133,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/41_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "ex8-42",
@@ -2177,8 +2177,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/42_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -2231,8 +2231,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/43_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -2282,8 +2282,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/44_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "ex8-45",
@@ -2339,8 +2339,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/45_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2393,8 +2393,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 266,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/46_hires.png",
+    "nationalPokedexNumber": 266,
     "evolvesTo": [
       "Beautifly"
     ]
@@ -2450,8 +2450,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/47_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "ex8-48",
@@ -2504,8 +2504,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/48_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ex8-49",
@@ -2558,8 +2558,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/49_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "ex8-50",
@@ -2605,8 +2605,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/50_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -2658,8 +2658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/51_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "ex8-52",
@@ -2696,7 +2696,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -2716,8 +2716,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/52_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2768,8 +2768,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/53_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -2819,8 +2819,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 339,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/54_hires.png",
+    "nationalPokedexNumber": 339,
     "evolvesTo": [
       "Whiscash"
     ]
@@ -2862,8 +2862,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/55_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2920,8 +2920,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/56_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -2957,7 +2957,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -2967,8 +2967,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/57_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -3025,8 +3025,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/58_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -3083,8 +3083,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/59_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3135,8 +3135,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/60_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3186,8 +3186,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/61_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -3228,8 +3228,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/62_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3280,8 +3280,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/63_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -3332,8 +3332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/64_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3384,8 +3384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/65_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3431,8 +3431,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/66_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -3483,8 +3483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/67_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -3530,8 +3530,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/68_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3572,7 +3572,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3582,8 +3582,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/69_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3640,8 +3640,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/70_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3691,8 +3691,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/71_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3748,8 +3748,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/72_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -3789,7 +3789,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Slakoth."
       }
     ],
@@ -3799,8 +3799,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/73_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -3851,8 +3851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/74_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -3904,8 +3904,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/75_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -3956,8 +3956,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/76_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3998,8 +3998,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/77_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4040,8 +4040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/78_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -4093,8 +4093,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/79_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -4141,8 +4141,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/80_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -4190,8 +4190,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/81_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -4241,8 +4241,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/82_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -4289,8 +4289,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex8/83_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -4548,7 +4548,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads. If you get 2 or more heads, the Defending Pokémon is now Confused."
       },
       {
@@ -4575,8 +4575,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/96_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ex8-97",
@@ -4624,8 +4624,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/97_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex8-98",
@@ -4675,8 +4675,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/98_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex8-99",
@@ -4726,8 +4726,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/99_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex8-100",
@@ -4788,8 +4788,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/100_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "ex8-101",
@@ -4850,8 +4850,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/101_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex8-102",
@@ -4890,7 +4890,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage for each basic Energy card attached to Rayquaza ex."
       }
     ],
@@ -4910,8 +4910,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/102_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex8-103",
@@ -4983,8 +4983,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/103_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "ex8-104",
@@ -5042,8 +5042,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/104_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "ex8-105",
@@ -5105,8 +5105,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/105_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "ex8-106",
@@ -5168,8 +5168,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/106_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "ex8-107",
@@ -5202,7 +5202,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -5234,7 +5234,7 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex8/107_hires.png",
+    "nationalPokedexNumber": 384
   }
 ]
diff --git a/json/cards/Diamond & Pearl.json b/json/cards/Diamond & Pearl.json
index 8ace2f0d8..5d0ec0e9a 100644
--- a/json/cards/Diamond & Pearl.json	
+++ b/json/cards/Diamond & Pearl.json	
@@ -54,8 +54,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/1_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "dp1-2",
@@ -110,8 +110,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/2_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "dp1-3",
@@ -167,8 +167,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/3_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "dp1-4",
@@ -221,8 +221,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/4_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "dp1-5",
@@ -249,7 +249,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -269,8 +269,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/5_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "dp1-6",
@@ -320,8 +320,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/6_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "dp1-7",
@@ -375,8 +375,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/7_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "dp1-8",
@@ -432,8 +432,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/8_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "dp1-9",
@@ -482,8 +482,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/9_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "dp1-10",
@@ -540,8 +540,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/10_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "dp1-11",
@@ -592,8 +592,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/11_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "dp1-12",
@@ -649,8 +649,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/12_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "dp1-13",
@@ -702,8 +702,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/13_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "dp1-14",
@@ -757,8 +757,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/14_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "dp1-15",
@@ -816,8 +816,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 435,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/15_hires.png",
+    "nationalPokedexNumber": 435
   },
   {
     "id": "dp1-16",
@@ -872,8 +872,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 398,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/16_hires.png",
+    "nationalPokedexNumber": 398
   },
   {
     "id": "dp1-17",
@@ -930,8 +930,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/17_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "dp1-18",
@@ -982,8 +982,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/18_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "dp1-19",
@@ -1042,8 +1042,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/19_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "dp1-20",
@@ -1095,8 +1095,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 400,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/20_hires.png",
+    "nationalPokedexNumber": 400
   },
   {
     "id": "dp1-21",
@@ -1152,8 +1152,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/21_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "dp1-22",
@@ -1185,7 +1185,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -1206,8 +1206,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/22_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "dp1-23",
@@ -1261,8 +1261,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/23_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "dp1-24",
@@ -1316,8 +1316,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/24_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "dp1-25",
@@ -1371,8 +1371,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/25_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "dp1-26",
@@ -1423,8 +1423,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/26_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "dp1-27",
@@ -1481,8 +1481,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/27_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "dp1-28",
@@ -1532,8 +1532,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/28_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "dp1-29",
@@ -1595,8 +1595,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/29_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "dp1-30",
@@ -1647,8 +1647,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/30_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "dp1-31",
@@ -1701,8 +1701,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/31_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "dp1-32",
@@ -1754,8 +1754,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/32_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "dp1-33",
@@ -1790,7 +1790,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard 2 cards from your hand. (If you can't discard 2 cards, this attack does nothing.) Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1800,8 +1800,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 446,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/33_hires.png",
+    "nationalPokedexNumber": 446,
     "evolvesTo": [
       "Snorlax"
     ]
@@ -1861,8 +1861,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/34_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "dp1-35",
@@ -1916,8 +1916,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/35_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "dp1-36",
@@ -1969,8 +1969,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 432,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/36_hires.png",
+    "nationalPokedexNumber": 432
   },
   {
     "id": "dp1-37",
@@ -2024,8 +2024,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/37_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "dp1-38",
@@ -2058,7 +2058,7 @@
           "Metal"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -2086,8 +2086,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/38_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "dp1-39",
@@ -2130,7 +2130,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Grass Pokémon in play (both yours and your opponent's)."
       }
     ],
@@ -2146,8 +2146,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/39_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "dp1-40",
@@ -2188,7 +2188,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the total amount of Darkness Energy attached to all of your Pokémon."
       }
     ],
@@ -2204,8 +2204,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/40_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "dp1-41",
@@ -2247,8 +2247,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/41_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "dp1-42",
@@ -2292,8 +2292,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 360,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/42_hires.png",
+    "nationalPokedexNumber": 360,
     "evolvesTo": [
       "Wobbuffet"
     ]
@@ -2340,8 +2340,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 406,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/43_hires.png",
+    "nationalPokedexNumber": 406,
     "evolvesTo": [
       "Roselia"
     ]
@@ -2396,8 +2396,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 268,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/44_hires.png",
+    "nationalPokedexNumber": 268,
     "evolvesTo": [
       "Dustox"
     ]
@@ -2457,8 +2457,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/45_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "dp1-46",
@@ -2513,8 +2513,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/46_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -2575,8 +2575,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/47_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -2629,8 +2629,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 239,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/48_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
     ]
@@ -2692,8 +2692,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 388,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/49_hires.png",
+    "nationalPokedexNumber": 388,
     "evolvesTo": [
       "Torterra"
     ]
@@ -2749,8 +2749,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/50_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2808,8 +2808,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/51_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -2865,8 +2865,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/52_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -2922,8 +2922,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/53_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2958,7 +2958,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2985,8 +2985,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/54_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -3039,8 +3039,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 458,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/55_hires.png",
+    "nationalPokedexNumber": 458,
     "evolvesTo": [
       "Mantine"
     ]
@@ -3080,7 +3080,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3090,8 +3090,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 391,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/56_hires.png",
+    "nationalPokedexNumber": 391,
     "evolvesTo": [
       "Infernape"
     ]
@@ -3150,8 +3150,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/57_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -3204,8 +3204,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 394,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/58_hires.png",
+    "nationalPokedexNumber": 394,
     "evolvesTo": [
       "Empoleon"
     ]
@@ -3257,8 +3257,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/59_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "dp1-60",
@@ -3317,8 +3317,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/60_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -3360,8 +3360,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/61_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -3395,7 +3395,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Seaking."
       },
       {
@@ -3415,8 +3415,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/62_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "dp1-63",
@@ -3468,8 +3468,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 266,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/63_hires.png",
+    "nationalPokedexNumber": 266,
     "evolvesTo": [
       "Beautifly"
     ]
@@ -3526,8 +3526,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/64_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -3574,8 +3574,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/65_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp1-66",
@@ -3619,8 +3619,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/66_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp1-67",
@@ -3664,8 +3664,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/67_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp1-68",
@@ -3709,8 +3709,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/68_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp1-69",
@@ -3754,8 +3754,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 298,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/69_hires.png",
+    "nationalPokedexNumber": 298,
     "evolvesTo": [
       "Marill"
     ]
@@ -3806,8 +3806,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/70_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -3854,8 +3854,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 438,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/71_hires.png",
+    "nationalPokedexNumber": 438,
     "evolvesTo": [
       "Sudowoodo"
     ]
@@ -3897,8 +3897,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/72_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -3950,8 +3950,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/73_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -4008,8 +4008,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/74_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "dp1-75",
@@ -4064,8 +4064,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/75_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -4117,8 +4117,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/76_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -4170,8 +4170,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/77_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -4218,8 +4218,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 173,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/78_hires.png",
+    "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
     ]
@@ -4277,8 +4277,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/79_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -4336,8 +4336,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/80_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -4397,8 +4397,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/81_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -4446,8 +4446,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/82_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -4499,8 +4499,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 431,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/83_hires.png",
+    "nationalPokedexNumber": 431,
     "evolvesTo": [
       "Purugly"
     ]
@@ -4552,8 +4552,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/84_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -4611,8 +4611,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/85_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -4655,8 +4655,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/86_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -4714,8 +4714,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/87_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -4767,8 +4767,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/88_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -4820,8 +4820,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/89_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -4868,8 +4868,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 439,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/90_hires.png",
+    "nationalPokedexNumber": 439
   },
   {
     "id": "dp1-91",
@@ -4924,8 +4924,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/91_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -4979,8 +4979,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/92_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -5032,8 +5032,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/93_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -5085,8 +5085,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/94_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -5145,8 +5145,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/95_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -5198,8 +5198,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/96_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -5257,8 +5257,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/97_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -5306,8 +5306,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/98_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -5350,7 +5350,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage time the number of heads."
       }
     ],
@@ -5360,8 +5360,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 451,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/99_hires.png",
+    "nationalPokedexNumber": 451,
     "evolvesTo": [
       "Drapion"
     ]
@@ -5393,7 +5393,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -5419,8 +5419,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/100_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -5478,8 +5478,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/101_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -5537,8 +5537,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/102_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -5596,8 +5596,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/103_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -5648,8 +5648,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp1/104_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -5975,8 +5975,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/120_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "dp1-121",
@@ -6021,8 +6021,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/121_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/121_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "dp1-122",
@@ -6075,8 +6075,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp1/122_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "dp1-123",
diff --git a/json/cards/Double Crisis.json b/json/cards/Double Crisis.json
index e1b3410da..1d7fd3dee 100644
--- a/json/cards/Double Crisis.json	
+++ b/json/cards/Double Crisis.json	
@@ -37,8 +37,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/1_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -89,8 +89,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/2_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "dc1-3",
@@ -129,8 +129,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/3_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -186,8 +186,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/4_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -244,8 +244,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/5_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "dc1-6",
@@ -295,8 +295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/6_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "dc1-7",
@@ -346,8 +346,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/7_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -398,8 +398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/8_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "dc1-9",
@@ -447,8 +447,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/9_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "dc1-10",
@@ -487,8 +487,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/10_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -538,8 +538,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/11_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "dc1-12",
@@ -578,8 +578,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/12_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -635,8 +635,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/13_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -694,8 +694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/14_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "dc1-15",
@@ -745,8 +745,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/15_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "dc1-16",
@@ -800,8 +800,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/16_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -858,8 +858,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/17_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -919,8 +919,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/18_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "dc1-19",
@@ -977,8 +977,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/19_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "dc1-20",
@@ -1016,8 +1016,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/dc1/20_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -1063,8 +1063,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/21_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "dc1-22",
@@ -1113,8 +1113,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dc1/22_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "dc1-23",
diff --git a/json/cards/Dragon Frontiers.json b/json/cards/Dragon Frontiers.json
index b4d02646e..d6c5d1d3b 100644
--- a/json/cards/Dragon Frontiers.json	
+++ b/json/cards/Dragon Frontiers.json	
@@ -44,8 +44,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ex15-2",
@@ -102,8 +102,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/2_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "ex15-3",
@@ -156,8 +156,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/3_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "ex15-4",
@@ -220,8 +220,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/4_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "ex15-5",
@@ -268,8 +268,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/5_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "ex15-6",
@@ -322,8 +322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/6_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "ex15-7",
@@ -370,8 +370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/7_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "ex15-8",
@@ -413,8 +413,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/8_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ex15-9",
@@ -468,8 +468,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/9_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "ex15-10",
@@ -503,8 +503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/10_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "ex15-11",
@@ -557,8 +557,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/11_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -607,8 +607,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/12_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ex15-13",
@@ -658,8 +658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/13_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "ex15-14",
@@ -703,8 +703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/14_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "ex15-15",
@@ -761,8 +761,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/15_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "ex15-16",
@@ -809,8 +809,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/16_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -857,8 +857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/17_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "ex15-18",
@@ -900,8 +900,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/18_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "ex15-19",
@@ -948,8 +948,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/19_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -995,8 +995,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/20_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "ex15-21",
@@ -1042,8 +1042,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/21_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "ex15-22",
@@ -1094,8 +1094,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/22_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -1131,7 +1131,7 @@
           "Metal"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to Tropius."
       }
     ],
@@ -1141,8 +1141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/23_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "ex15-24",
@@ -1198,8 +1198,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/24_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -1247,8 +1247,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/25_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "ex15-26",
@@ -1294,8 +1294,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/26_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -1348,8 +1348,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/27_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -1397,8 +1397,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/28_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1445,8 +1445,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/29_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1489,8 +1489,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/30_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1541,8 +1541,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/31_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -1596,8 +1596,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/32_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -1652,8 +1652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/33_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -1708,8 +1708,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/34_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -1763,8 +1763,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/35_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -1818,8 +1818,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/36_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -1873,8 +1873,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/37_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -1923,8 +1923,8 @@
         "text": "Shelgon does 10 damage to itself."
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/38_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -1974,8 +1974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/39_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "ex15-40",
@@ -2023,8 +2023,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/40_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "ex15-41",
@@ -2062,8 +2062,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/41_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -2109,8 +2109,8 @@
         "text": "If the Defending Pokémon is Pokémon-ex, that Pokémon is now Confused."
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/42_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -2145,8 +2145,8 @@
         "text": "During your opponent's next turn, any damage done to Bagon by attacks is reduced by 10 (after applying Weakness and Resistance)."
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/43_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2203,8 +2203,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/44_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -2246,8 +2246,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/45_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -2282,8 +2282,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/46_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2334,8 +2334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/47_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -2381,8 +2381,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 239,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/48_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
     ]
@@ -2413,7 +2413,7 @@
           "Fire"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Feebas."
       }
     ],
@@ -2423,8 +2423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/49_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -2465,8 +2465,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/50_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -2517,8 +2517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/51_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -2569,8 +2569,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/52_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -2620,8 +2620,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/53_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -2662,8 +2662,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/54_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -2704,8 +2704,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/55_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -2755,8 +2755,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/56_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -2806,8 +2806,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/57_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -2849,8 +2849,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/58_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2893,8 +2893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/59_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2934,7 +2934,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to the Defending Pokémon."
       }
     ],
@@ -2944,8 +2944,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/60_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -2996,8 +2996,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/61_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3048,8 +3048,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/62_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -3090,8 +3090,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/63_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -3137,8 +3137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 238,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/64_hires.png",
+    "nationalPokedexNumber": 238,
     "evolvesTo": [
       "Jynx"
     ]
@@ -3185,8 +3185,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/65_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -3233,8 +3233,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/66_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -3285,8 +3285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/67_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -3337,8 +3337,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/68_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -3379,8 +3379,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/69_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -3431,8 +3431,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/70_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3483,8 +3483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex15/71_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -3875,8 +3875,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/90_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "ex15-91",
@@ -3927,8 +3927,8 @@
         "text": "Put 8 damage counters on the Defending Pokémon. If that Pokémon would be Knocked Out by this attack, you may put any damage counters not necessary to Knocked Out the Defending Pokémon on your opponent's Benched Pokémon in any way you like."
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/91_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "ex15-92",
@@ -3973,8 +3973,8 @@
         "text": "Does 10 damage to each of your opponent's Benched Pokémon that has any damage counters on it. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/92_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "ex15-93",
@@ -4025,8 +4025,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/93_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "ex15-94",
@@ -4086,8 +4086,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/94_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ex15-95",
@@ -4137,8 +4137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/95_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "ex15-96",
@@ -4198,8 +4198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/96_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "ex15-97",
@@ -4254,8 +4254,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/97_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex15-98",
@@ -4328,8 +4328,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/98_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "ex15-99",
@@ -4397,8 +4397,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/99_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ex15-100",
@@ -4455,8 +4455,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/100_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ex15-101",
@@ -4506,7 +4506,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex15/101_hires.png",
+    "nationalPokedexNumber": 151
   }
 ]
diff --git a/json/cards/Dragon Vault.json b/json/cards/Dragon Vault.json
index cd7392229..3166fd3e4 100644
--- a/json/cards/Dragon Vault.json	
+++ b/json/cards/Dragon Vault.json	
@@ -36,8 +36,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/1_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -87,8 +87,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/2_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -143,8 +143,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/3_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -197,8 +197,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/4_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -256,8 +256,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/5_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "dv1-6",
@@ -305,8 +305,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/6_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -361,8 +361,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/7_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -413,8 +413,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/8_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "dv1-9",
@@ -462,8 +462,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/9_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "dv1-10",
@@ -513,8 +513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/10_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "dv1-11",
@@ -565,8 +565,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/11_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "dv1-12",
@@ -613,8 +613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/12_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -656,8 +656,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/13_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -706,8 +706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 611,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/14_hires.png",
+    "nationalPokedexNumber": 611,
     "evolvesTo": [
       "Haxorus"
     ]
@@ -762,8 +762,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 611,
     "imageUrlHiRes": "https://images.pokemontcg.io/dv1/15_hires.png",
+    "nationalPokedexNumber": 611,
     "evolvesTo": [
       "Haxorus"
     ]
@@ -819,8 +819,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 612,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/16_hires.png",
+    "nationalPokedexNumber": 612
   },
   {
     "id": "dv1-17",
@@ -871,8 +871,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dv1/17_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "dv1-18",
diff --git a/json/cards/Dragon.json b/json/cards/Dragon.json
index 3f4346f9f..3b6e9a3cf 100644
--- a/json/cards/Dragon.json
+++ b/json/cards/Dragon.json
@@ -51,8 +51,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/1_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "ex3-2",
@@ -111,8 +111,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/2_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "ex3-3",
@@ -159,8 +159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/3_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "ex3-4",
@@ -222,8 +222,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/4_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "ex3-5",
@@ -280,8 +280,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/5_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "ex3-6",
@@ -332,8 +332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/6_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "ex3-7",
@@ -392,8 +392,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/7_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "ex3-8",
@@ -452,8 +452,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/8_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "ex3-9",
@@ -505,8 +505,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/9_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -577,8 +577,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/10_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "ex3-11",
@@ -616,8 +616,8 @@
         "text": "Put 1 damage counter, plus 1 more damage counter for each damage counter on Shedinja, on the Defending Pokémon."
       }
     ],
-    "nationalPokedexNumber": 292,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/11_hires.png",
+    "nationalPokedexNumber": 292
   },
   {
     "id": "ex3-12",
@@ -666,8 +666,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/12_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "ex3-13",
@@ -717,8 +717,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/13_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "ex3-14",
@@ -780,8 +780,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/14_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -825,8 +825,8 @@
         "text": "Flip a coin. If tails, discard an Energy card attached to Flygon."
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/15_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "ex3-16",
@@ -874,8 +874,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/16_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "ex3-17",
@@ -886,7 +886,7 @@
     "evolvesFrom": "Magnemite",
     "ability": {
       "name": "Magnetic Field",
-      "text": "Once during your turn (before your attack), if you have basic Energy cards in your discard pile, you may discard any 1 card from your hand. Then search up to 2 basic Energy cards from your discard pile, show them to your opponent, and put them into your hand. You can't return the card you first discarded to your hand in this way. This power can't be used if Magneton is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), if you have basic Energy cards in your discard pile, you may discard any 1 card from your hand. Then search for up to 2 basic Energy cards from your discard pile, show them to your opponent, and put them into your hand. You can't return the card you first discarded to your hand in this way. This power can't be used if Magneton is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "70",
@@ -910,7 +910,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to all of your Pokémon (including Magneton)."
       }
     ],
@@ -926,8 +926,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/17_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -972,8 +972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/18_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -1017,8 +1017,8 @@
         "text": "You may discard an Energy card attached to Salamence. If you do, this attack does 40 damage plus 20 more damage."
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/19_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "ex3-20",
@@ -1079,8 +1079,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/20_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -1137,8 +1137,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/21_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ex3-22",
@@ -1197,8 +1197,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/22_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -1259,8 +1259,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/23_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -1315,8 +1315,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/24_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex3-25",
@@ -1367,8 +1367,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/25_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1428,8 +1428,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/26_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -1487,8 +1487,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/27_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1549,8 +1549,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/28_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "ex3-29",
@@ -1581,7 +1581,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to Graveler."
       },
       {
@@ -1603,8 +1603,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/29_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -1660,8 +1660,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/30_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -1710,8 +1710,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/31_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -1767,8 +1767,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/32_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ex3-33",
@@ -1796,7 +1796,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin. If heads, this attack does 10 damage times the number of damage counters on Horsea."
       },
       {
@@ -1815,8 +1815,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/33_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -1876,8 +1876,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/34_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ex3-35",
@@ -1928,8 +1928,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/35_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1972,8 +1972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/36_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -2025,8 +2025,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/37_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -2075,8 +2075,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/38_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -2129,8 +2129,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/39_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2184,8 +2184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/40_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2228,8 +2228,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/41_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2278,8 +2278,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/42_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2335,8 +2335,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/43_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -2377,8 +2377,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/44_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -2434,8 +2434,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/45_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "ex3-46",
@@ -2474,8 +2474,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/46_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -2519,12 +2519,12 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/47_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -2585,8 +2585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/48_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "ex3-49",
@@ -2628,8 +2628,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/49_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2674,8 +2674,8 @@
         "text": "The Defending Pokémon is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/50_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2726,8 +2726,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 339,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/51_hires.png",
+    "nationalPokedexNumber": 339,
     "evolvesTo": [
       "Whiscash"
     ]
@@ -2777,8 +2777,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/52_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -2829,8 +2829,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/53_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -2881,8 +2881,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/54_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -2932,8 +2932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/55_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -2974,8 +2974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/56_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -3025,8 +3025,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/57_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -3077,8 +3077,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/58_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -3135,8 +3135,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/59_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3187,8 +3187,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/60_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3245,8 +3245,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/61_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3293,8 +3293,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/62_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3335,8 +3335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/63_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3383,8 +3383,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/64_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3425,8 +3425,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/65_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -3467,8 +3467,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/66_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -3509,7 +3509,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3519,8 +3519,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/67_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -3561,8 +3561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/68_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -3613,8 +3613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/69_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3665,8 +3665,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/70_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3713,8 +3713,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/71_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3735,6 +3735,9 @@
     "series": "EX",
     "set": "Dragon",
     "setCode": "ex3",
+    "types": [
+      "Fire"
+    ],
     "attacks": [
       {
         "name": "Ram",
@@ -3762,11 +3765,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Fire"
-    ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/72_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -3807,8 +3807,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/73_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3859,8 +3859,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/74_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3916,8 +3916,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/75_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -3964,8 +3964,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/76_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -4007,8 +4007,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/77_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -4049,8 +4049,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/78_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4101,8 +4101,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/79_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4150,8 +4150,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/80_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -4201,8 +4201,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex3/81_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -4396,8 +4396,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/89_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ex3-90",
@@ -4469,8 +4469,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/90_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "ex3-91",
@@ -4536,8 +4536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/91_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "ex3-92",
@@ -4597,8 +4597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/92_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ex3-93",
@@ -4662,8 +4662,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/93_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "ex3-94",
@@ -4727,8 +4727,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/94_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "ex3-95",
@@ -4784,8 +4784,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/95_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ex3-96",
@@ -4845,8 +4845,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/96_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "ex3-97",
@@ -4889,7 +4889,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Discard either all Fire Energy or all Lightning Energy attached to Rayquaza ex. This attack does 40 damage times the amount of Fire or Lightning Energy discarded."
       }
     ],
@@ -4909,7 +4909,7 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex3/97_hires.png",
+    "nationalPokedexNumber": 384
   }
 ]
diff --git a/json/cards/Dragons Exalted.json b/json/cards/Dragons Exalted.json
index dd5b069f8..47d0223b5 100644
--- a/json/cards/Dragons Exalted.json	
+++ b/json/cards/Dragons Exalted.json	
@@ -25,7 +25,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -41,8 +41,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/1_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -71,7 +71,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -87,8 +87,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/2_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -138,8 +138,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/3_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "bw6-4",
@@ -184,8 +184,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/4_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -242,8 +242,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/5_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "bw6-6",
@@ -281,8 +281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/6_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -338,8 +338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 266,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/7_hires.png",
+    "nationalPokedexNumber": 266,
     "evolvesTo": [
       "Beautifly"
     ]
@@ -392,8 +392,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/8_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "bw6-9",
@@ -444,8 +444,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 268,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/9_hires.png",
+    "nationalPokedexNumber": 268,
     "evolvesTo": [
       "Dustox"
     ]
@@ -486,8 +486,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/10_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -535,8 +535,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/11_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -567,7 +567,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -592,8 +592,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/12_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -641,8 +641,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/13_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -674,7 +674,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 4 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -701,8 +701,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/14_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "bw6-15",
@@ -753,8 +753,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/15_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "bw6-16",
@@ -811,8 +811,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 556,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/16_hires.png",
+    "nationalPokedexNumber": 556
   },
   {
     "id": "bw6-17",
@@ -840,7 +840,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -856,8 +856,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 590,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/17_hires.png",
+    "nationalPokedexNumber": 590,
     "evolvesTo": [
       "Amoonguss"
     ]
@@ -898,8 +898,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/18_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -946,8 +946,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/19_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "bw6-20",
@@ -997,8 +997,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/20_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -1053,8 +1053,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/21_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "bw6-22",
@@ -1109,8 +1109,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/22_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "bw6-23",
@@ -1138,7 +1138,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
@@ -1148,8 +1148,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/23_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -1207,8 +1207,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/24_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "bw6-25",
@@ -1259,8 +1259,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/25_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -1295,7 +1295,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin. If heads, this attack does 30 damage times the amount of Water Energy attached to this Pokémon."
       },
       {
@@ -1317,8 +1317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/26_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "bw6-27",
@@ -1356,8 +1356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/27_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -1410,8 +1410,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/28_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "bw6-29",
@@ -1451,8 +1451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/29_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -1508,8 +1508,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/30_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -1568,8 +1568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/31_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "bw6-32",
@@ -1607,8 +1607,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/32_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -1660,8 +1660,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/33_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "bw6-34",
@@ -1699,8 +1699,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 535,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/34_hires.png",
+    "nationalPokedexNumber": 535,
     "evolvesTo": [
       "Palpitoad"
     ]
@@ -1753,8 +1753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 536,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/35_hires.png",
+    "nationalPokedexNumber": 536,
     "evolvesTo": [
       "Seismitoad"
     ]
@@ -1811,8 +1811,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/36_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "bw6-37",
@@ -1853,7 +1853,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -1863,8 +1863,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 594,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/37_hires.png",
+    "nationalPokedexNumber": 594
   },
   {
     "id": "bw6-38",
@@ -1912,8 +1912,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/38_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -1966,8 +1966,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/39_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -2017,8 +2017,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/40_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "bw6-41",
@@ -2066,8 +2066,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/41_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2099,7 +2099,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2109,8 +2109,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/42_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2139,7 +2139,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to all of your opponent's Pokémon."
       },
       {
@@ -2160,8 +2160,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/43_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "bw6-44",
@@ -2210,8 +2210,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/44_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "bw6-45",
@@ -2261,8 +2261,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/45_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "bw6-46",
@@ -2308,8 +2308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/46_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "bw6-47",
@@ -2359,8 +2359,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/47_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "bw6-48",
@@ -2395,8 +2395,8 @@
         "text": "Put 3 damage counters on your opponent's Pokémon in any way you like."
       }
     ],
-    "nationalPokedexNumber": 292,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/48_hires.png",
+    "nationalPokedexNumber": 292
   },
   {
     "id": "bw6-49",
@@ -2434,8 +2434,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/49_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -2486,8 +2486,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/50_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -2519,7 +2519,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Does 50 damage times the number of Special Energy cards in your opponent's discard pile."
       },
       {
@@ -2539,8 +2539,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/51_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "bw6-52",
@@ -2585,8 +2585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/52_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "bw6-53",
@@ -2637,8 +2637,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/53_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -2689,8 +2689,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/54_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "bw6-55",
@@ -2728,8 +2728,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/55_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -2782,8 +2782,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 575,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/56_hires.png",
+    "nationalPokedexNumber": 575,
     "evolvesTo": [
       "Gothitelle"
     ]
@@ -2838,8 +2838,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 576,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/57_hires.png",
+    "nationalPokedexNumber": 576
   },
   {
     "id": "bw6-58",
@@ -2891,8 +2891,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 622,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/58_hires.png",
+    "nationalPokedexNumber": 622,
     "evolvesTo": [
       "Golurk"
     ]
@@ -2951,8 +2951,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/59_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "bw6-60",
@@ -3006,8 +3006,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/60_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -3066,8 +3066,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/61_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "bw6-62",
@@ -3107,8 +3107,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/62_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -3159,8 +3159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/63_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -3216,8 +3216,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/64_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "bw6-65",
@@ -3269,8 +3269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 524,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/65_hires.png",
+    "nationalPokedexNumber": 524,
     "evolvesTo": [
       "Boldore"
     ]
@@ -3304,7 +3304,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -3325,8 +3325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 525,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/66_hires.png",
+    "nationalPokedexNumber": 525,
     "evolvesTo": [
       "Gigalith"
     ]
@@ -3385,8 +3385,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 526,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/67_hires.png",
+    "nationalPokedexNumber": 526
   },
   {
     "id": "bw6-68",
@@ -3440,8 +3440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 538,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/68_hires.png",
+    "nationalPokedexNumber": 538
   },
   {
     "id": "bw6-69",
@@ -3490,8 +3490,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 539,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/69_hires.png",
+    "nationalPokedexNumber": 539
   },
   {
     "id": "bw6-70",
@@ -3547,8 +3547,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 618,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/70_hires.png",
+    "nationalPokedexNumber": 618
   },
   {
     "id": "bw6-71",
@@ -3603,8 +3603,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/71_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw6-72",
@@ -3658,8 +3658,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/72_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -3720,8 +3720,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/73_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "bw6-74",
@@ -3776,8 +3776,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/74_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3836,8 +3836,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/75_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "bw6-76",
@@ -3881,8 +3881,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/76_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -3941,8 +3941,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 435,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/77_hires.png",
+    "nationalPokedexNumber": 435
   },
   {
     "id": "bw6-78",
@@ -3988,8 +3988,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/78_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -4051,8 +4051,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/79_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -4110,8 +4110,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/80_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "bw6-81",
@@ -4175,8 +4175,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/81_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "bw6-82",
@@ -4236,8 +4236,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/82_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "bw6-83",
@@ -4275,7 +4275,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -4291,8 +4291,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 632,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/83_hires.png",
+    "nationalPokedexNumber": 632
   },
   {
     "id": "bw6-84",
@@ -4338,8 +4338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/84_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "bw6-85",
@@ -4380,7 +4380,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 2,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Discard all basic Fire Energy or all basic Lightning Energy attached to this Pokémon. This attack does 60 damage times the number of Energy cards you discarded."
       }
     ],
@@ -4390,8 +4390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/85_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -4440,8 +4440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/86_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -4492,8 +4492,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/87_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -4545,8 +4545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/88_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -4594,8 +4594,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/89_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -4647,8 +4647,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/90_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "bw6-91",
@@ -4695,8 +4695,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/91_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "bw6-92",
@@ -4753,8 +4753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/92_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "bw6-93",
@@ -4803,8 +4803,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/93_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -4857,8 +4857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/94_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -4913,8 +4913,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/95_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -4969,8 +4969,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/96_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -5022,8 +5022,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/97_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "bw6-98",
@@ -5078,8 +5078,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/98_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "bw6-99",
@@ -5107,7 +5107,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -5117,8 +5117,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/99_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -5150,7 +5150,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -5160,7 +5160,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of cards in your hand."
       }
     ],
@@ -5170,8 +5170,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 424,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/100_hires.png",
+    "nationalPokedexNumber": 424
   },
   {
     "id": "bw6-101",
@@ -5210,8 +5210,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/101_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -5254,8 +5254,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/102_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -5308,8 +5308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/103_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "bw6-104",
@@ -5363,8 +5363,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/104_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -5411,8 +5411,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/105_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -5455,8 +5455,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/106_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -5513,8 +5513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 400,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/107_hires.png",
+    "nationalPokedexNumber": 400
   },
   {
     "id": "bw6-108",
@@ -5565,8 +5565,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/108_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "bw6-109",
@@ -5614,8 +5614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/109_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -5664,8 +5664,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 626,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/110_hires.png",
+    "nationalPokedexNumber": 626
   },
   {
     "id": "bw6-111",
@@ -5719,8 +5719,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 627,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/111_hires.png",
+    "nationalPokedexNumber": 627,
     "evolvesTo": [
       "Braviary"
     ]
@@ -5760,7 +5760,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 3 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -5776,8 +5776,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 628,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/112_hires.png",
+    "nationalPokedexNumber": 628
   },
   {
     "id": "bw6-113",
@@ -5934,8 +5934,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/119_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/119_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "bw6-120",
@@ -5981,8 +5981,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/120_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "bw6-121",
@@ -6037,8 +6037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/121_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/121_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw6-122",
@@ -6102,8 +6102,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/122_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "bw6-123",
@@ -6144,7 +6144,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 2,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Discard all basic Fire Energy or all basic Lightning Energy attached to this Pokémon. This attack does 60 damage times the number of Energy cards you discarded."
       }
     ],
@@ -6154,8 +6154,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw6/123_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -6213,8 +6213,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/124_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/124_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "bw6-125",
@@ -6265,8 +6265,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/125_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/125_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bw6-126",
@@ -6313,8 +6313,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/126_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/126_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "bw6-127",
@@ -6359,7 +6359,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Does 40 damage times the number of Prize cards you have taken."
       }
     ],
@@ -6375,8 +6375,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/127_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/127_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "bw6-128",
@@ -6427,7 +6427,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/128_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw6/128_hires.png",
+    "nationalPokedexNumber": 384
   }
 ]
diff --git a/json/cards/Emerald.json b/json/cards/Emerald.json
index 5b59a9aa2..f6320e84c 100644
--- a/json/cards/Emerald.json
+++ b/json/cards/Emerald.json
@@ -51,8 +51,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/1_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex9-2",
@@ -96,8 +96,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/2_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex9-3",
@@ -171,8 +171,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/3_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "ex9-4",
@@ -230,8 +230,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/4_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "ex9-5",
@@ -280,8 +280,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/5_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "ex9-6",
@@ -331,8 +331,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/6_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "ex9-7",
@@ -389,8 +389,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/7_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex9-8",
@@ -441,8 +441,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/8_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "ex9-9",
@@ -493,8 +493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/9_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex9-10",
@@ -557,8 +557,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/10_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "ex9-11",
@@ -614,8 +614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/11_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "ex9-12",
@@ -663,8 +663,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 358,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/12_hires.png",
+    "nationalPokedexNumber": 358
   },
   {
     "id": "ex9-13",
@@ -714,8 +714,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/13_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "ex9-14",
@@ -767,8 +767,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/14_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "ex9-15",
@@ -818,8 +818,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/15_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "ex9-16",
@@ -874,8 +874,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/16_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex9-17",
@@ -923,8 +923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/17_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -975,8 +975,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/18_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "ex9-19",
@@ -1028,8 +1028,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/19_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -1081,8 +1081,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/20_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "ex9-21",
@@ -1130,8 +1130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/21_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "ex9-22",
@@ -1181,8 +1181,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/22_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "ex9-23",
@@ -1234,8 +1234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/23_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex9-24",
@@ -1281,8 +1281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/24_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex9-25",
@@ -1333,8 +1333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/25_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1394,8 +1394,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/26_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "ex9-27",
@@ -1445,8 +1445,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/27_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ex9-28",
@@ -1502,8 +1502,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/28_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -1557,8 +1557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/29_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "ex9-30",
@@ -1607,8 +1607,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/30_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "ex9-31",
@@ -1659,8 +1659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/31_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "ex9-32",
@@ -1708,8 +1708,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/32_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "ex9-33",
@@ -1760,8 +1760,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/33_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -1811,8 +1811,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 264,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/34_hires.png",
+    "nationalPokedexNumber": 264
   },
   {
     "id": "ex9-35",
@@ -1863,8 +1863,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/35_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -1917,8 +1917,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/36_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -1971,8 +1971,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/37_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "ex9-38",
@@ -2022,8 +2022,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/38_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ex9-39",
@@ -2078,8 +2078,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/39_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "ex9-40",
@@ -2131,8 +2131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 317,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/40_hires.png",
+    "nationalPokedexNumber": 317
   },
   {
     "id": "ex9-41",
@@ -2186,8 +2186,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/41_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "ex9-42",
@@ -2235,8 +2235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/42_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "ex9-43",
@@ -2285,8 +2285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/43_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -2327,8 +2327,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/44_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -2375,8 +2375,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/45_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -2423,8 +2423,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/46_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -2471,8 +2471,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/47_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2529,8 +2529,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/48_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2577,8 +2577,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/49_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -2619,8 +2619,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/50_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -2671,8 +2671,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/51_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -2714,8 +2714,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/52_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -2766,8 +2766,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/53_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "ex9-54",
@@ -2805,8 +2805,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/54_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -2857,8 +2857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/55_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -2899,8 +2899,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/56_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -2950,8 +2950,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/57_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3003,8 +3003,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/58_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3050,8 +3050,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/59_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -3102,8 +3102,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/60_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3144,8 +3144,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/61_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3196,8 +3196,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/62_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3254,8 +3254,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/63_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -3296,8 +3296,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/64_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -3339,8 +3339,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/65_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3381,8 +3381,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/66_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -3434,8 +3434,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/67_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -3482,8 +3482,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/68_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -3524,8 +3524,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/69_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -3572,8 +3572,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/70_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -3625,8 +3625,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/71_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -3677,8 +3677,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/72_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3729,8 +3729,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/73_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -3781,8 +3781,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 263,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/74_hires.png",
+    "nationalPokedexNumber": 263,
     "evolvesTo": [
       "Linoone"
     ]
@@ -4111,8 +4111,8 @@
         "text": "This attack's damage isn't affected by Resistance, Poké-Powers, Poké-Bodies, or any other effects on the Defending Pokémon."
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/90_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "ex9-91",
@@ -4171,8 +4171,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/91_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "ex9-92",
@@ -4233,8 +4233,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/92_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex9-93",
@@ -4283,8 +4283,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/93_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex9-94",
@@ -4343,8 +4343,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex9/94_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -4407,8 +4407,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/95_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "ex9-96",
@@ -4468,8 +4468,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/96_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "ex9-97",
@@ -4527,8 +4527,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/97_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex9-98",
@@ -4583,8 +4583,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 378,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/98_hires.png",
+    "nationalPokedexNumber": 378
   },
   {
     "id": "ex9-99",
@@ -4639,8 +4639,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/99_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "ex9-100",
@@ -4694,8 +4694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex9/100_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "ex9-101",
diff --git a/json/cards/Emerging Powers.json b/json/cards/Emerging Powers.json
index e3b4d6282..196c77fc5 100644
--- a/json/cards/Emerging Powers.json	
+++ b/json/cards/Emerging Powers.json	
@@ -51,8 +51,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/1_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -113,8 +113,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 512,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/2_hires.png",
+    "nationalPokedexNumber": 512
   },
   {
     "id": "bw2-3",
@@ -161,8 +161,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/3_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -213,8 +213,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/4_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -267,8 +267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 541,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/5_hires.png",
+    "nationalPokedexNumber": 541,
     "evolvesTo": [
       "Leavanny"
     ]
@@ -321,8 +321,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 541,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/6_hires.png",
+    "nationalPokedexNumber": 541,
     "evolvesTo": [
       "Leavanny"
     ]
@@ -374,8 +374,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 542,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/7_hires.png",
+    "nationalPokedexNumber": 542
   },
   {
     "id": "bw2-8",
@@ -425,8 +425,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 542,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/8_hires.png",
+    "nationalPokedexNumber": 542
   },
   {
     "id": "bw2-9",
@@ -470,8 +470,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 546,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/9_hires.png",
+    "nationalPokedexNumber": 546,
     "evolvesTo": [
       "Whimsicott"
     ]
@@ -518,8 +518,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 546,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/10_hires.png",
+    "nationalPokedexNumber": 546,
     "evolvesTo": [
       "Whimsicott"
     ]
@@ -573,8 +573,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 547,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/11_hires.png",
+    "nationalPokedexNumber": 547
   },
   {
     "id": "bw2-12",
@@ -629,8 +629,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 547,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/12_hires.png",
+    "nationalPokedexNumber": 547
   },
   {
     "id": "bw2-13",
@@ -684,8 +684,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 548,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/13_hires.png",
+    "nationalPokedexNumber": 548,
     "evolvesTo": [
       "Lilligant"
     ]
@@ -744,8 +744,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 549,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/14_hires.png",
+    "nationalPokedexNumber": 549
   },
   {
     "id": "bw2-15",
@@ -799,8 +799,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 585,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/15_hires.png",
+    "nationalPokedexNumber": 585,
     "evolvesTo": [
       "Sawsbuck"
     ]
@@ -860,8 +860,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 586,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/16_hires.png",
+    "nationalPokedexNumber": 586
   },
   {
     "id": "bw2-17",
@@ -917,8 +917,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/17_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw2-18",
@@ -966,8 +966,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/18_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -1021,8 +1021,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/19_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "bw2-20",
@@ -1072,8 +1072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 554,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/20_hires.png",
+    "nationalPokedexNumber": 554,
     "evolvesTo": [
       "Darmanitan"
     ]
@@ -1130,8 +1130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 555,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/21_hires.png",
+    "nationalPokedexNumber": 555
   },
   {
     "id": "bw2-22",
@@ -1179,8 +1179,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 515,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/22_hires.png",
+    "nationalPokedexNumber": 515,
     "evolvesTo": [
       "Simipour"
     ]
@@ -1234,8 +1234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 516,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/23_hires.png",
+    "nationalPokedexNumber": 516
   },
   {
     "id": "bw2-24",
@@ -1284,8 +1284,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 550,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/24_hires.png",
+    "nationalPokedexNumber": 550
   },
   {
     "id": "bw2-25",
@@ -1333,8 +1333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 550,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/25_hires.png",
+    "nationalPokedexNumber": 550
   },
   {
     "id": "bw2-26",
@@ -1388,8 +1388,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/26_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -1449,8 +1449,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 581,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/27_hires.png",
+    "nationalPokedexNumber": 581
   },
   {
     "id": "bw2-28",
@@ -1499,8 +1499,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 613,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/28_hires.png",
+    "nationalPokedexNumber": 613,
     "evolvesTo": [
       "Beartic"
     ]
@@ -1543,8 +1543,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 613,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/29_hires.png",
+    "nationalPokedexNumber": 613,
     "evolvesTo": [
       "Beartic"
     ]
@@ -1602,8 +1602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 614,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/30_hires.png",
+    "nationalPokedexNumber": 614
   },
   {
     "id": "bw2-31",
@@ -1654,8 +1654,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 614,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/31_hires.png",
+    "nationalPokedexNumber": 614
   },
   {
     "id": "bw2-32",
@@ -1700,8 +1700,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/32_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "bw2-33",
@@ -1739,8 +1739,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/33_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -1789,8 +1789,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 596,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/34_hires.png",
+    "nationalPokedexNumber": 596
   },
   {
     "id": "bw2-35",
@@ -1839,8 +1839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/35_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bw2-36",
@@ -1879,8 +1879,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 527,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/36_hires.png",
+    "nationalPokedexNumber": 527,
     "evolvesTo": [
       "Swoobat"
     ]
@@ -1938,8 +1938,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 528,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/37_hires.png",
+    "nationalPokedexNumber": 528
   },
   {
     "id": "bw2-38",
@@ -1988,8 +1988,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 543,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/38_hires.png",
+    "nationalPokedexNumber": 543,
     "evolvesTo": [
       "Whirlipede"
     ]
@@ -2044,8 +2044,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 544,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/39_hires.png",
+    "nationalPokedexNumber": 544,
     "evolvesTo": [
       "Scolipede"
     ]
@@ -2100,8 +2100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 545,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/40_hires.png",
+    "nationalPokedexNumber": 545
   },
   {
     "id": "bw2-41",
@@ -2156,8 +2156,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/41_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "bw2-42",
@@ -2212,8 +2212,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/42_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "bw2-43",
@@ -2261,8 +2261,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/43_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -2304,8 +2304,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/44_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -2357,8 +2357,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 575,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/45_hires.png",
+    "nationalPokedexNumber": 575,
     "evolvesTo": [
       "Gothitelle"
     ]
@@ -2411,8 +2411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 575,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/46_hires.png",
+    "nationalPokedexNumber": 575,
     "evolvesTo": [
       "Gothitelle"
     ]
@@ -2462,8 +2462,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 576,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/47_hires.png",
+    "nationalPokedexNumber": 576
   },
   {
     "id": "bw2-48",
@@ -2513,8 +2513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 576,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/48_hires.png",
+    "nationalPokedexNumber": 576
   },
   {
     "id": "bw2-49",
@@ -2564,8 +2564,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 524,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/49_hires.png",
+    "nationalPokedexNumber": 524,
     "evolvesTo": [
       "Boldore"
     ]
@@ -2617,8 +2617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 524,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/50_hires.png",
+    "nationalPokedexNumber": 524,
     "evolvesTo": [
       "Boldore"
     ]
@@ -2675,8 +2675,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 525,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/51_hires.png",
+    "nationalPokedexNumber": 525,
     "evolvesTo": [
       "Gigalith"
     ]
@@ -2732,8 +2732,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 525,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/52_hires.png",
+    "nationalPokedexNumber": 525,
     "evolvesTo": [
       "Gigalith"
     ]
@@ -2790,8 +2790,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 526,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/53_hires.png",
+    "nationalPokedexNumber": 526
   },
   {
     "id": "bw2-54",
@@ -2845,8 +2845,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 529,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/54_hires.png",
+    "nationalPokedexNumber": 529,
     "evolvesTo": [
       "Excadrill"
     ]
@@ -2895,8 +2895,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 529,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/55_hires.png",
+    "nationalPokedexNumber": 529,
     "evolvesTo": [
       "Excadrill"
     ]
@@ -2956,8 +2956,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/56_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "bw2-57",
@@ -3015,8 +3015,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/57_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "bw2-58",
@@ -3056,8 +3056,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 538,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/58_hires.png",
+    "nationalPokedexNumber": 538
   },
   {
     "id": "bw2-59",
@@ -3096,8 +3096,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 539,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/59_hires.png",
+    "nationalPokedexNumber": 539
   },
   {
     "id": "bw2-60",
@@ -3137,8 +3137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/60_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -3192,8 +3192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/61_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -3250,8 +3250,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/62_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "bw2-63",
@@ -3304,8 +3304,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/63_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw2-64",
@@ -3350,8 +3350,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/64_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -3410,8 +3410,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 510,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/65_hires.png",
+    "nationalPokedexNumber": 510
   },
   {
     "id": "bw2-66",
@@ -3465,8 +3465,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/66_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -3526,8 +3526,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/67_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "bw2-68",
@@ -3581,8 +3581,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 629,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/68_hires.png",
+    "nationalPokedexNumber": 629,
     "evolvesTo": [
       "Mandibuzz"
     ]
@@ -3640,8 +3640,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 630,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/69_hires.png",
+    "nationalPokedexNumber": 630
   },
   {
     "id": "bw2-70",
@@ -3687,8 +3687,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 597,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/70_hires.png",
+    "nationalPokedexNumber": 597,
     "evolvesTo": [
       "Ferrothorn"
     ]
@@ -3737,8 +3737,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 597,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/71_hires.png",
+    "nationalPokedexNumber": 597,
     "evolvesTo": [
       "Ferrothorn"
     ]
@@ -3798,8 +3798,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 598,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/72_hires.png",
+    "nationalPokedexNumber": 598
   },
   {
     "id": "bw2-73",
@@ -3856,8 +3856,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 598,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/73_hires.png",
+    "nationalPokedexNumber": 598
   },
   {
     "id": "bw2-74",
@@ -3912,8 +3912,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 599,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/74_hires.png",
+    "nationalPokedexNumber": 599,
     "evolvesTo": [
       "Klang"
     ]
@@ -3972,8 +3972,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 600,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/75_hires.png",
+    "nationalPokedexNumber": 600,
     "evolvesTo": [
       "Klinklang"
     ]
@@ -4035,8 +4035,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 601,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/76_hires.png",
+    "nationalPokedexNumber": 601
   },
   {
     "id": "bw2-77",
@@ -4093,8 +4093,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/77_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bw2-78",
@@ -4132,8 +4132,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/78_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -4185,8 +4185,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 505,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/79_hires.png",
+    "nationalPokedexNumber": 505
   },
   {
     "id": "bw2-80",
@@ -4231,8 +4231,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 519,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/80_hires.png",
+    "nationalPokedexNumber": 519,
     "evolvesTo": [
       "Tranquill"
     ]
@@ -4291,8 +4291,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 520,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/81_hires.png",
+    "nationalPokedexNumber": 520,
     "evolvesTo": [
       "Unfezant"
     ]
@@ -4348,8 +4348,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 521,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/82_hires.png",
+    "nationalPokedexNumber": 521
   },
   {
     "id": "bw2-83",
@@ -4399,8 +4399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/83_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "bw2-84",
@@ -4438,8 +4438,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/84_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -4491,8 +4491,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/85_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "bw2-86",
@@ -4546,8 +4546,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 627,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/86_hires.png",
+    "nationalPokedexNumber": 627,
     "evolvesTo": [
       "Braviary"
     ]
@@ -4604,8 +4604,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 627,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw2/87_hires.png",
+    "nationalPokedexNumber": 627,
     "evolvesTo": [
       "Braviary"
     ]
@@ -4665,8 +4665,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 628,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/88_hires.png",
+    "nationalPokedexNumber": 628
   },
   {
     "id": "bw2-89",
@@ -4721,8 +4721,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/89_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bw2-90",
@@ -4890,8 +4890,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/97_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bw2-98",
@@ -4946,7 +4946,7 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw2/98_hires.png",
+    "nationalPokedexNumber": 641
   }
 ]
diff --git a/json/cards/Evolutions.json b/json/cards/Evolutions.json
index f43276cab..fb255e811 100644
--- a/json/cards/Evolutions.json
+++ b/json/cards/Evolutions.json
@@ -55,8 +55,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/1_hires.png",
+    "nationalPokedexNumber": 3,
     "evolvesTo": "M Venusaur-EX"
   },
   {
@@ -106,8 +106,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/2_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "xy12-3",
@@ -145,8 +145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/3_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -200,8 +200,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/4_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -242,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/5_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -297,8 +297,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/6_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -347,8 +347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/7_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "xy12-8",
@@ -399,8 +399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/8_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -451,8 +451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/9_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -507,8 +507,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/10_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -566,8 +566,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/11_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy12-12",
@@ -623,8 +623,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/12_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -672,8 +672,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/13_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy12-14",
@@ -712,8 +712,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/14_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -766,8 +766,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/15_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "xy12-16",
@@ -801,8 +801,8 @@
         "text": "Discard all Fire Energy attached to this Pokémon. This attack does 60 more damage for each Energy card discarded in this way."
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/16_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "xy12-17",
@@ -851,8 +851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/17_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -903,8 +903,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/18_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "xy12-19",
@@ -953,8 +953,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/19_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -1008,8 +1008,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/20_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -1067,8 +1067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/21_hires.png",
+    "nationalPokedexNumber": 9,
     "evolvesTo": "M Blastoise-EX"
   },
   {
@@ -1116,8 +1116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/22_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "xy12-23",
@@ -1156,8 +1156,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/23_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -1211,8 +1211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/24_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -1267,8 +1267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/25_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "xy12-26",
@@ -1323,8 +1323,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/26_hires.png",
+    "nationalPokedexNumber": 80,
     "evolvesTo": "M Slowbro-EX"
   },
   {
@@ -1372,8 +1372,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/27_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "xy12-28",
@@ -1422,8 +1422,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/28_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -1478,8 +1478,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/29_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "xy12-30",
@@ -1517,8 +1517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/30_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -1566,8 +1566,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/31_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "xy12-32",
@@ -1600,8 +1600,8 @@
         "text": "This attack does 100 damage to each of your opponent's Pokémon BREAK. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/32_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "xy12-33",
@@ -1639,8 +1639,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/33_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -1698,8 +1698,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/34_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xy12-35",
@@ -1753,8 +1753,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/35_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1813,8 +1813,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/36_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "xy12-37",
@@ -1868,8 +1868,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/37_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -1929,8 +1929,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/38_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1977,8 +1977,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/39_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -2033,8 +2033,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/40_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "xy12-41",
@@ -2089,8 +2089,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/41_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -2147,8 +2147,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/42_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "xy12-43",
@@ -2186,8 +2186,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/43_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -2241,8 +2241,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/44_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2298,8 +2298,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/45_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "xy12-46",
@@ -2334,8 +2334,8 @@
         "text": "Your opponent's Active Pokémon is now Poisoned. Put 2 damage counters instead of 1 on that Pokémon between turns."
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/46_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "xy12-47",
@@ -2389,8 +2389,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/47_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -2448,8 +2448,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/48_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2500,8 +2500,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/49_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -2543,8 +2543,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/50_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -2597,8 +2597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/51_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xy12-52",
@@ -2661,8 +2661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/52_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -2707,8 +2707,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/53_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "xy12-54",
@@ -2746,8 +2746,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/54_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -2794,8 +2794,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/55_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -2849,8 +2849,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/56_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "xy12-57",
@@ -2890,8 +2890,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/57_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -2946,8 +2946,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/58_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2997,8 +2997,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/59_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xy12-60",
@@ -3033,8 +3033,8 @@
         "text": "During your next turn, this Pokémon's attacks do 100 more damage to your opponent's Active Pokémon (before applying Weakness and Resistance)."
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/60_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xy12-61",
@@ -3084,8 +3084,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/61_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3138,8 +3138,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/62_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "xy12-63",
@@ -3194,8 +3194,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/63_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -3256,8 +3256,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/64_hires.png",
+    "nationalPokedexNumber": 18,
     "evolvesTo": "M Pidgeot-EX"
   },
   {
@@ -3306,8 +3306,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/65_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "xy12-66",
@@ -3350,8 +3350,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/66_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -3402,8 +3402,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/67_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "xy12-68",
@@ -3458,8 +3458,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/68_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "xy12-69",
@@ -3503,8 +3503,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/69_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -3560,8 +3560,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/70_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -3602,8 +3602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/71_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -3663,8 +3663,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/72_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "xy12-73",
@@ -4145,8 +4145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/100_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "xy12-101",
@@ -4193,8 +4193,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/101_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy12-102",
@@ -4241,8 +4241,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/102_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "xy12-103",
@@ -4305,8 +4305,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/103_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -4365,8 +4365,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy12/104_hires.png",
+    "nationalPokedexNumber": 18,
     "evolvesTo": "M Pidgeot-EX"
   },
   {
@@ -4415,8 +4415,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/105_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "xy12-106",
@@ -4473,8 +4473,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/106_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "xy12-107",
@@ -4549,7 +4549,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy12/109_hires.png",
+    "nationalPokedexNumber": 103
   }
 ]
diff --git a/json/cards/Expedition Base Set.json b/json/cards/Expedition Base Set.json
index 84834cb6f..d24370546 100644
--- a/json/cards/Expedition Base Set.json	
+++ b/json/cards/Expedition Base Set.json	
@@ -44,8 +44,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/1_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "ecard1-2",
@@ -93,8 +93,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/2_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ecard1-3",
@@ -134,7 +134,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "(20+) If the Defending Pokémon is Poisoned, this attack does 20 damage plus 20 more damage."
+        "text": "If the Defending Pokémon is Poisoned, this attack does 20 damage plus 20 more damage."
       }
     ],
     "weaknesses": [
@@ -143,8 +143,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/3_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "ecard1-4",
@@ -182,7 +182,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40+",
-        "text": "(40+) Does 40 damage plus 10 more damage for each Energy attached to Blastoise but not used to pay for this attack's Energy cost. You can't add more than 20 damage in this way."
+        "text": "Does 40 damage plus 10 more damage for each Energy attached to Blastoise but not used to pay for this attack's Energy cost. You can't add more than 20 damage in this way."
       }
     ],
     "weaknesses": [
@@ -191,8 +191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/4_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "ecard1-5",
@@ -235,8 +235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/5_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "ecard1-6",
@@ -247,7 +247,7 @@
     "evolvesFrom": "Charmeleon",
     "ability": {
       "name": "Burning Energy",
-      "text": "Once during your turn (before you attack), you may turn all basic Energy attached to all of your Pokémon into R Energy for the rest of the turn. This power can't be used if Charizard is affected by a Special Condition.",
+      "text": "Once during your turn (before you attack), you may turn all basic Energy attached to all of your Pokémon into Fire Energy for the rest of the turn. This power can't be used if Charizard is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "120",
@@ -285,8 +285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/6_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ecard1-7",
@@ -322,7 +322,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -331,8 +331,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/7_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "ecard1-8",
@@ -375,7 +375,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20×",
-        "text": "(20x) Flip 4 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -384,8 +384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/8_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "ecard1-9",
@@ -423,11 +423,11 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40×",
-        "text": "(40x) Flip 2 coins. This attack does 40 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/9_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "ecard1-10",
@@ -483,8 +483,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/10_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "ecard1-11",
@@ -538,8 +538,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/11_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "ecard1-12",
@@ -588,8 +588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/12_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "ecard1-13",
@@ -641,8 +641,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/13_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "ecard1-14",
@@ -692,8 +692,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/14_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "ecard1-15",
@@ -744,8 +744,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/15_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "ecard1-16",
@@ -784,7 +784,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "50+",
-        "text": "(50+) Count the number of Pokémon you have in play with damage counters on them. Flip a coin. If heads, this attack does 50 damage plus 10 more damage for each of those Pokémon."
+        "text": "Count the number of Pokémon you have in play with damage counters on them. Flip a coin. If heads, this attack does 50 damage plus 10 more damage for each of those Pokémon."
       }
     ],
     "weaknesses": [
@@ -793,8 +793,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/16_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ecard1-17",
@@ -812,6 +812,9 @@
     "series": "E-Card",
     "set": "Expedition Base Set",
     "setCode": "ecard1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Fire"
     ],
@@ -826,11 +829,8 @@
         "text": "Flip a coin. If heads, put a basic Energy cards from your discard pile into your hand."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/17_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -871,7 +871,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50",
+        "damage": "40",
         "text": "The Defending Pokémon is now Poisoned."
       }
     ],
@@ -887,8 +887,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/18_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "ecard1-19",
@@ -927,8 +927,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/19_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "ecard1-20",
@@ -978,8 +978,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/20_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ecard1-21",
@@ -1021,7 +1021,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "(30+) Discard all R Energy cards attached to Ninetales. This attack does 30 damage plus 10 more damage for each cards discarded this way."
+        "text": "Discard all R Energy cards attached to Ninetales. This attack does 30 damage plus 10 more damage for each cards discarded this way."
       }
     ],
     "weaknesses": [
@@ -1030,8 +1030,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/21_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ecard1-22",
@@ -1049,6 +1049,9 @@
     "series": "E-Card",
     "set": "Expedition Base Set",
     "setCode": "ecard1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Lightning"
     ],
@@ -1063,11 +1066,8 @@
         "text": "Take an Energy card attached to one of your Pokémon and attach it to another of your Pokémon."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/22_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -1081,7 +1081,7 @@
     "evolvesFrom": "Pidgeotto",
     "ability": {
       "name": "Beating Wings",
-      "text": "Once during your turn (before you attack), If Pidgeot is your Active Pokémon, you may shuffle 1 of your Benched Pokémon and all cards attached to it in your deck. This power can't be used if Pidgeot is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), If Pidgeot is your Active Pokémon, you may shuffle 1 of your Benched Pokémon and all cards attached to it in your deck. This power can't be used if Pidgeot is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "80",
@@ -1104,7 +1104,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 30 more damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 30 more damage."
       }
     ],
     "weaknesses": [
@@ -1119,8 +1119,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/23_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "ecard1-24",
@@ -1159,7 +1159,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "40+",
-        "text": "Flip a number of coins equal to the amount of Energy cards attached to Poliwrath. This attack does 40 damage plus 10 more damage for each heads."
+        "text": "Flip a number of coins equal to the amount of W Energy cards attached to Poliwrath. This attack does 40 damage plus 10 more damage for each heads."
       }
     ],
     "weaknesses": [
@@ -1168,8 +1168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/24_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "ecard1-25",
@@ -1219,8 +1219,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/25_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ecard1-26",
@@ -1268,8 +1268,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/26_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "ecard1-27",
@@ -1300,7 +1300,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 10 more damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 10 more damage."
       },
       {
         "name": "Air Cutter",
@@ -1326,8 +1326,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/27_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ecard1-28",
@@ -1375,8 +1375,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/28_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ecard1-29",
@@ -1432,8 +1432,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/29_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ecard1-30",
@@ -1481,8 +1481,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/30_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "ecard1-31",
@@ -1519,7 +1519,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30×",
-        "text": "(30x) Flip 3 coins. This attack does 30 damage times the number of heads. Vileplume is now Confused."
+        "text": "Flip 3 coins. This attack does 30 damage times the number of heads. Vileplume is now Confused."
       }
     ],
     "weaknesses": [
@@ -1528,8 +1528,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/31_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "ecard1-32",
@@ -1581,8 +1581,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/32_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "ecard1-33",
@@ -1629,8 +1629,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/33_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "ecard1-34",
@@ -1678,8 +1678,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/34_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ecard1-35",
@@ -1727,8 +1727,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/35_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "ecard1-36",
@@ -1770,7 +1770,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40×",
-        "text": "(40x) Flip 2 coins. This attack does 40 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -1779,8 +1779,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/36_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "ecard1-37",
@@ -1817,7 +1817,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40+",
-        "text": "(40+) Does 40 damage plus 10 more damage for each Energy attached to Blastoise but not used to pay for this attack's Energy cost. You can't add more than 20 damage in this way."
+        "text": "Does 40 damage plus 10 more damage for each Energy attached to Blastoise but not used to pay for this attack's Energy cost. You can't add more than 20 damage in this way."
       }
     ],
     "weaknesses": [
@@ -1826,8 +1826,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/37_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "ecard1-38",
@@ -1870,8 +1870,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/38_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "ecard1-39",
@@ -1922,8 +1922,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/39_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ecard1-40",
@@ -1972,8 +1972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/40_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ecard1-41",
@@ -2009,7 +2009,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -2018,8 +2018,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/41_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "ecard1-42",
@@ -2062,7 +2062,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20×",
-        "text": "(20x) Flip 4 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -2071,8 +2071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/42_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "ecard1-43",
@@ -2110,11 +2110,11 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40×",
-        "text": "(40x) Flip 2 coins. This attack does 40 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/43_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "ecard1-44",
@@ -2170,8 +2170,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/44_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "ecard1-45",
@@ -2225,8 +2225,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/45_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "ecard1-46",
@@ -2268,7 +2268,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "(30+) Flip 2 coins. This attack does 30 damage plus 20 more damage for each heads."
+        "text": "Flip 2 coins. This attack does 30 damage plus 20 more damage for each heads."
       }
     ],
     "weaknesses": [
@@ -2277,8 +2277,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/46_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "ecard1-47",
@@ -2327,8 +2327,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/47_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "ecard1-48",
@@ -2380,8 +2380,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/48_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "ecard1-49",
@@ -2431,8 +2431,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/49_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "ecard1-50",
@@ -2483,8 +2483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/50_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "ecard1-51",
@@ -2523,7 +2523,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "50+",
-        "text": "(50+) Count the number of Pokémon you have in play with damage counters on them. Flip a coin. If heads, this attack does 50 damage plus 10 more damage for each of those Pokémon."
+        "text": "Count the number of Pokémon you have in play with damage counters on them. Flip a coin. If heads, this attack does 50 damage plus 10 more damage for each of those Pokémon."
       }
     ],
     "weaknesses": [
@@ -2532,8 +2532,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/51_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ecard1-52",
@@ -2551,6 +2551,9 @@
     "series": "E-Card",
     "set": "Expedition Base Set",
     "setCode": "ecard1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Fire"
     ],
@@ -2565,11 +2568,8 @@
         "text": "Flip a coin. If heads, put a basic Energy cards from your discard pile into your hand."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/52_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -2630,8 +2630,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/53_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "ecard1-54",
@@ -2685,8 +2685,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/54_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "ecard1-55",
@@ -2725,8 +2725,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/55_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "ecard1-56",
@@ -2776,8 +2776,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/56_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ecard1-57",
@@ -2819,7 +2819,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "(30+) Discard all Energy cards attached to Ninetales. This attack does 30 damage plus 10 more damage for each cards discarded this way."
+        "text": "Discard all R Energy cards attached to Ninetales. This attack does 30 damage plus 10 more damage for each cards discarded this way."
       }
     ],
     "weaknesses": [
@@ -2828,8 +2828,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/57_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ecard1-58",
@@ -2847,6 +2847,9 @@
     "series": "E-Card",
     "set": "Expedition Base Set",
     "setCode": "ecard1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Lightning"
     ],
@@ -2861,11 +2864,8 @@
         "text": "Take an Energy card attached to one of your Pokémon and attach it to another of your Pokémon."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/58_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -2879,7 +2879,7 @@
     "evolvesFrom": "Pidgeotto",
     "ability": {
       "name": "Beating Wings",
-      "text": "Once during your turn (before you attack), If Pidgeot is your Active Pokémon, you may shuffle 1 of your Benched Pokémon and all cards attached to it in your deck. This power can't be used if Pidgeot is affected by a Special Condition.",
+      "text": "Once during your turn (before your attack), If Pidgeot is your Active Pokémon, you may shuffle 1 of your Benched Pokémon and all cards attached to it in your deck. This power can't be used if Pidgeot is affected by a Special Condition.",
       "type": "Poké-Power"
     },
     "hp": "80",
@@ -2902,7 +2902,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 30 more damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 30 more damage."
       }
     ],
     "weaknesses": [
@@ -2917,8 +2917,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/59_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "ecard1-60",
@@ -2957,7 +2957,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "40+",
-        "text": "(40+) Flip a number of coins equal to the amount of W Energy cards attached to Poliwrath. This attack does 40 damage plus 10 more damage for each heads."
+        "text": "Flip a number of coins equal to the amount of W Energy cards attached to Poliwrath. This attack does 40 damage plus 10 more damage for each heads."
       }
     ],
     "weaknesses": [
@@ -2966,8 +2966,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/60_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "ecard1-61",
@@ -3008,7 +3008,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "60",
-        "text": "Discard all Energy cards attached to Raichu or this attack does nothing."
+        "text": "Discard all L Energy cards attached to Raichu or this attack does nothing."
       }
     ],
     "weaknesses": [
@@ -3017,8 +3017,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/61_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ecard1-62",
@@ -3046,7 +3046,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20",
-        "text": "If your opponent has any Benched Pokémon, flip a coin. If heads, choose 1 of them and this attack does 10 damage to it. (don't apply Weakness and Resistance for Benched Pokémon.)"
+        "text": "If your opponent has any Benched Pokémon, flip a coin. If heads, choose 1 of them and this attack does 10 damage to it. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       },
       {
         "name": "Flame Tail",
@@ -3066,8 +3066,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/62_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "ecard1-63",
@@ -3098,7 +3098,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 10 more damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 10 more damage."
       },
       {
         "name": "Air Cutter",
@@ -3124,8 +3124,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/63_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ecard1-64",
@@ -3156,7 +3156,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10+",
-        "text": "(10+) Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
+        "text": "Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
       },
       {
         "name": "Thermal Blast",
@@ -3176,8 +3176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/64_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ecard1-65",
@@ -3225,8 +3225,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/65_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ecard1-66",
@@ -3267,7 +3267,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "50+",
-        "text": "(50+) Flip a coin. If heads, this attack does 50 damage plus 10 more damage and does 10 damage to each of your opponent's Benched Pokémon, if any. (Don't apply Weakness and Resistance for Benched Pokémon.)"
+        "text": "Flip a coin. If heads, this attack does 50 damage plus 10 more damage and does 10 damage to each of your opponent's Benched Pokémon, if any. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
     "weaknesses": [
@@ -3282,8 +3282,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/66_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ecard1-67",
@@ -3325,7 +3325,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30×",
-        "text": "(30x) Flip 3 coins. This attack does 30 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -3334,8 +3334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/67_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "ecard1-68",
@@ -3383,8 +3383,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/68_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "ecard1-69",
@@ -3421,7 +3421,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30×",
-        "text": "(30x) Flip 3 coins. This attack does 30 damage times the number of heads. Vileplume is now Confused."
+        "text": "Flip 3 coins. This attack does 30 damage times the number of heads. Vileplume is now Confused."
       }
     ],
     "weaknesses": [
@@ -3430,8 +3430,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/69_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "ecard1-70",
@@ -3483,8 +3483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/70_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "ecard1-71",
@@ -3539,8 +3539,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/71_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -3585,7 +3585,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "",
-        "text": "(10x) Count the number for Pokémon on your Bench. This attack does 10 times that number to the Defending Pokémon, and Chansey does 10 times that number of damage to itself."
+        "text": "Count the number for Pokémon on your Bench. This attack does 10 times that number to the Defending Pokémon, and Chansey does 10 times that number of damage to itself."
       }
     ],
     "weaknesses": [
@@ -3594,8 +3594,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/72_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -3629,7 +3629,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
         "name": "Flamethrower",
@@ -3649,8 +3649,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/73_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -3704,8 +3704,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/74_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -3740,11 +3740,11 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip a coin until you get tails. This attack does 20 damage times the number of heads."
+        "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/75_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -3796,8 +3796,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/76_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -3851,8 +3851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/77_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -3906,8 +3906,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/78_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -3964,8 +3964,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/79_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -4024,8 +4024,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/80_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -4078,8 +4078,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/81_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "ecard1-82",
@@ -4130,8 +4130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/82_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -4184,8 +4184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/83_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "ecard1-84",
@@ -4234,8 +4234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/84_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -4289,8 +4289,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/85_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -4334,7 +4334,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "(30+) Flip a coin. If heads, this attack does 30 damage plus 10 more damage. If tails, Magmar does 10 damage to itself."
+        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage. If tails, Magmar does 10 damage to itself."
       }
     ],
     "weaknesses": [
@@ -4343,8 +4343,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/86_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -4392,8 +4392,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/87_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -4439,8 +4439,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/88_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -4494,8 +4494,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/89_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -4538,8 +4538,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/90_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -4593,8 +4593,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/91_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -4627,7 +4627,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) Flip 2 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
         "name": "Giant Wave",
@@ -4646,8 +4646,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/92_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -4697,8 +4697,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/93_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -4749,8 +4749,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/94_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -4801,8 +4801,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/95_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -4853,8 +4853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/96_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -4886,7 +4886,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) Flip 2 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
         "name": "Flare",
@@ -4905,8 +4905,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/97_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -4957,8 +4957,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/98_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -5000,7 +5000,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -5015,8 +5015,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/99_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -5073,8 +5073,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/100_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -5124,8 +5124,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/101_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -5170,7 +5170,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20×",
-        "text": "(20x) Flip 3 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -5179,8 +5179,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/102_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "ecard1-103",
@@ -5234,8 +5234,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/103_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -5277,7 +5277,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "10+",
-        "text": "(10+) Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
+        "text": "Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
       }
     ],
     "weaknesses": [
@@ -5286,8 +5286,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/104_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -5338,8 +5338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/105_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -5371,7 +5371,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) Flip 3 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -5386,8 +5386,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/106_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -5420,8 +5420,8 @@
         "text": "Flip a coin. If tails, this attack does nothing."
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/107_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -5462,8 +5462,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/108_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -5510,8 +5510,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/109_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -5552,8 +5552,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/110_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -5594,8 +5594,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/111_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -5642,8 +5642,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/112_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -5690,8 +5690,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/113_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -5741,8 +5741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/114_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -5785,8 +5785,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/115_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -5837,8 +5837,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/116_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -5880,7 +5880,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -5889,8 +5889,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/117_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -5922,7 +5922,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) This attack does 10 damage times the number of damage counters on Magikarp."
+        "text": "This attack does 10 damage times the number of damage counters on Magikarp."
       }
     ],
     "weaknesses": [
@@ -5931,8 +5931,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/118_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -5973,8 +5973,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/119_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -6025,8 +6025,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/120_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -6058,7 +6058,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) Flip 2 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
         "name": "Pay Day",
@@ -6077,8 +6077,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/121_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -6129,8 +6129,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/122_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -6172,7 +6172,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "10×",
-        "text": "(10x) Flip 3 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -6187,8 +6187,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/123_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -6239,8 +6239,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/124_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -6291,8 +6291,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/125_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -6343,8 +6343,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/126_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -6386,8 +6386,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 211,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/127_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/127_hires.png",
+    "nationalPokedexNumber": 211
   },
   {
     "id": "ecard1-128",
@@ -6416,7 +6416,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10+",
-        "text": "(10+) Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
+        "text": "Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
       }
     ],
     "weaknesses": [
@@ -6425,8 +6425,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/128_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -6477,8 +6477,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/129_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -6525,8 +6525,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/130_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -6568,7 +6568,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -6577,8 +6577,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/131_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -6629,8 +6629,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/132_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -6683,8 +6683,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/133_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/133_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "ecard1-134",
@@ -6723,7 +6723,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -6732,8 +6732,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/134_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -6784,8 +6784,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/135_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -6836,8 +6836,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard1/136_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
diff --git a/json/cards/Fates Collide.json b/json/cards/Fates Collide.json
index 78b1fcb13..00f950f40 100644
--- a/json/cards/Fates Collide.json	
+++ b/json/cards/Fates Collide.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/1_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "xy10-2",
@@ -84,8 +84,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/2_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -139,8 +139,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/3_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -192,8 +192,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 414,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/4_hires.png",
+    "nationalPokedexNumber": 414,
     "evolvesTo": [
       "Burmy"
     ]
@@ -234,8 +234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/5_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -282,8 +282,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 496,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/6_hires.png",
+    "nationalPokedexNumber": 496,
     "evolvesTo": [
       "Serperior"
     ]
@@ -335,8 +335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/7_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "xy10-8",
@@ -374,8 +374,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 585,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/8_hires.png",
+    "nationalPokedexNumber": 585,
     "evolvesTo": [
       "Sawsbuck"
     ]
@@ -434,8 +434,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/9_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "xy10-10",
@@ -483,8 +483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 653,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/10_hires.png",
+    "nationalPokedexNumber": 653,
     "evolvesTo": [
       "Braixen"
     ]
@@ -525,8 +525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 653,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/11_hires.png",
+    "nationalPokedexNumber": 653,
     "evolvesTo": [
       "Braixen"
     ]
@@ -578,8 +578,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 654,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/12_hires.png",
+    "nationalPokedexNumber": 654,
     "evolvesTo": [
       "Delphox"
     ]
@@ -633,8 +633,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 655,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/13_hires.png",
+    "nationalPokedexNumber": 655
   },
   {
     "id": "xy10-14",
@@ -661,8 +661,8 @@
     "types": [
       "Fire"
     ],
-    "nationalPokedexNumber": 655,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/14_hires.png",
+    "nationalPokedexNumber": 655
   },
   {
     "id": "xy10-15",
@@ -701,8 +701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/15_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -758,8 +758,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/16_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "xy10-17",
@@ -801,8 +801,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/17_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -851,8 +851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/18_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "xy10-19",
@@ -879,8 +879,8 @@
     "types": [
       "Water"
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/19_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "xy10-20",
@@ -934,8 +934,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/20_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "xy10-21",
@@ -987,8 +987,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/21_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "xy10-22",
@@ -1028,8 +1028,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 688,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/22_hires.png",
+    "nationalPokedexNumber": 688,
     "evolvesTo": [
       "Barbaracle"
     ]
@@ -1080,8 +1080,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 689,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/23_hires.png",
+    "nationalPokedexNumber": 689
   },
   {
     "id": "xy10-24",
@@ -1135,8 +1135,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/24_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "xy10-25",
@@ -1184,8 +1184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/25_hires.png",
+    "nationalPokedexNumber": 65,
     "evolvesTo": "M Alakazam-EX"
   },
   {
@@ -1230,8 +1230,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/26_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "xy10-27",
@@ -1270,8 +1270,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/27_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -1327,8 +1327,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/28_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "xy10-29",
@@ -1368,8 +1368,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/29_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "xy10-30",
@@ -1407,8 +1407,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/30_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -1461,8 +1461,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/31_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "xy10-32",
@@ -1501,8 +1501,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/32_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -1544,8 +1544,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 577,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/33_hires.png",
+    "nationalPokedexNumber": 577,
     "evolvesTo": [
       "Duosion"
     ]
@@ -1588,8 +1588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 578,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/34_hires.png",
+    "nationalPokedexNumber": 578,
     "evolvesTo": [
       "Reuniclus"
     ]
@@ -1632,8 +1632,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/35_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "xy10-36",
@@ -1668,8 +1668,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/36_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -1718,8 +1718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/37_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "xy10-38",
@@ -1760,8 +1760,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/38_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -1816,8 +1816,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/39_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "xy10-40",
@@ -1855,8 +1855,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/40_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -1907,8 +1907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/41_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -1950,8 +1950,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/42_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2004,8 +2004,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/43_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "xy10-43a",
@@ -2055,8 +2055,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/43a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/43a_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "xy10-44",
@@ -2107,8 +2107,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/44_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2149,8 +2149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/45_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -2191,8 +2191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/46_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -2245,8 +2245,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/47_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "xy10-48",
@@ -2300,8 +2300,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 701,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/48_hires.png",
+    "nationalPokedexNumber": 701
   },
   {
     "id": "xy10-49",
@@ -2346,8 +2346,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 703,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/49_hires.png",
+    "nationalPokedexNumber": 703
   },
   {
     "id": "xy10-50",
@@ -2391,8 +2391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 703,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/50_hires.png",
+    "nationalPokedexNumber": 703
   },
   {
     "id": "xy10-51",
@@ -2425,8 +2425,8 @@
         "text": "Attach 2 Energy cards from your discard pile to 1 of your Fighting Pokémon."
       }
     ],
-    "nationalPokedexNumber": 703,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/51_hires.png",
+    "nationalPokedexNumber": 703
   },
   {
     "id": "xy10-52",
@@ -2475,8 +2475,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/52_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xy10-53",
@@ -2527,8 +2527,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/53_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xy10-54",
@@ -2592,8 +2592,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/54_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xy10-54a",
@@ -2657,8 +2657,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/54a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/54a_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xy10-55",
@@ -2716,8 +2716,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/55_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "xy10-56",
@@ -2774,8 +2774,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/56_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "xy10-57",
@@ -2830,8 +2830,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 629,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/57_hires.png",
+    "nationalPokedexNumber": 629,
     "evolvesTo": [
       "Mandibuzz"
     ]
@@ -2890,8 +2890,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 630,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/58_hires.png",
+    "nationalPokedexNumber": 630
   },
   {
     "id": "xy10-59",
@@ -2948,8 +2948,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/59_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -3007,8 +3007,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/60_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3065,8 +3065,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/61_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "xy10-62",
@@ -3100,8 +3100,8 @@
         "text": "Discard as many Metal Energy attached to this Pokémon as you like. For each Energy card discarded in this way, choose 1 of your opponent's Pokémon and do 30 damage to it. Don't apply Weakness and Resistance. (You may choose the same Pokémon more than once.)"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/62_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "xy10-63",
@@ -3157,8 +3157,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/63_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "xy10-64",
@@ -3213,8 +3213,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/64_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "xy10-65",
@@ -3269,8 +3269,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/65_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3331,8 +3331,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/66_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "xy10-67",
@@ -3386,8 +3386,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/67_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "xy10-68",
@@ -3433,8 +3433,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/68_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -3489,8 +3489,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/69_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "xy10-70",
@@ -3534,8 +3534,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 546,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/70_hires.png",
+    "nationalPokedexNumber": 546,
     "evolvesTo": [
       "Whimsicott"
     ]
@@ -3580,8 +3580,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 547,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/71_hires.png",
+    "nationalPokedexNumber": 547
   },
   {
     "id": "xy10-72",
@@ -3636,8 +3636,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 719,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/72_hires.png",
+    "nationalPokedexNumber": 719,
     "evolvesTo": "M Diancie-EX"
   },
   {
@@ -3691,8 +3691,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/73_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "xy10-74",
@@ -3731,8 +3731,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/74_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3788,8 +3788,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/75_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "xy10-76",
@@ -3843,8 +3843,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/76_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "xy10-77",
@@ -3899,8 +3899,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/77_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "xy10-78",
@@ -3952,8 +3952,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/78_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "xy10-79",
@@ -3989,8 +3989,8 @@
         "text": "Discard 2 Energy attached to this Pokémon."
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/79_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "xy10-80",
@@ -4039,8 +4039,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/80_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -4094,8 +4094,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/81_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -4152,8 +4152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/82_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "xy10-83",
@@ -4212,8 +4212,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/83_hires.png",
+    "nationalPokedexNumber": 334,
     "evolvesTo": "M Altaria-EX"
   },
   {
@@ -4268,8 +4268,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/84_hires.png",
+    "nationalPokedexNumber": 531,
     "evolvesTo": "M Audino-EX"
   },
   {
@@ -4317,8 +4317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/85_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "xy10-86",
@@ -4356,8 +4356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/86_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -4398,8 +4398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/87_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -4450,8 +4450,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/88_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "xy10-89",
@@ -4500,8 +4500,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/89_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "xy10-90",
@@ -5032,8 +5032,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/116_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/116_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "xy10-117",
@@ -5081,8 +5081,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/117_hires.png",
+    "nationalPokedexNumber": 65,
     "evolvesTo": "M Alakazam-EX"
   },
   {
@@ -5127,8 +5127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/118_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "xy10-119",
@@ -5186,8 +5186,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/119_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/119_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "xy10-120",
@@ -5242,8 +5242,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/120_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "xy10-121",
@@ -5295,8 +5295,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/121_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/121_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "xy10-122",
@@ -5349,8 +5349,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy10/122_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "xy10-123",
@@ -5409,8 +5409,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/123_hires.png",
+    "nationalPokedexNumber": 334,
     "evolvesTo": "M Altaria-EX"
   },
   {
@@ -5476,8 +5476,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy10/125_hires.png",
+    "nationalPokedexNumber": 65,
     "evolvesTo": "M Alakazam-EX"
   }
 ]
diff --git a/json/cards/FireRed & LeafGreen.json b/json/cards/FireRed & LeafGreen.json
index 87f77b81c..6d9ea00e8 100644
--- a/json/cards/FireRed & LeafGreen.json	
+++ b/json/cards/FireRed & LeafGreen.json	
@@ -44,8 +44,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/1_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "ex6-2",
@@ -104,8 +104,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/2_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "ex6-3",
@@ -161,8 +161,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/3_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "ex6-4",
@@ -205,8 +205,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/4_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ex6-5",
@@ -246,7 +246,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip a coin for each Energy attached to Exeggutor. This attack does 40 damage times the number of heads"
       }
     ],
@@ -256,8 +256,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/5_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "ex6-6",
@@ -317,8 +317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/6_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "ex6-7",
@@ -369,8 +369,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/7_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "ex6-8",
@@ -429,8 +429,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/8_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "ex6-9",
@@ -486,8 +486,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/9_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "ex6-10",
@@ -535,8 +535,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/10_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "ex6-11",
@@ -593,8 +593,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/11_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "ex6-12",
@@ -644,8 +644,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/12_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex6-13",
@@ -701,8 +701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/13_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "ex6-14",
@@ -747,8 +747,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/14_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "ex6-15",
@@ -804,8 +804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/15_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "ex6-16",
@@ -854,8 +854,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/16_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "ex6-17",
@@ -902,8 +902,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/17_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "ex6-18",
@@ -955,8 +955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/18_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ex6-19",
@@ -1006,8 +1006,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/19_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -1045,7 +1045,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads. If either of the coins is heads, the Defending Pokémon is now Paralyzed."
       },
       {
@@ -1066,8 +1066,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/20_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "ex6-21",
@@ -1102,7 +1102,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -1118,8 +1118,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/21_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "ex6-22",
@@ -1170,8 +1170,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/22_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "ex6-23",
@@ -1224,8 +1224,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/23_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "ex6-24",
@@ -1287,8 +1287,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/24_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "ex6-25",
@@ -1333,8 +1333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/25_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "ex6-26",
@@ -1384,8 +1384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/26_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "ex6-27",
@@ -1442,8 +1442,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/27_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1473,7 +1473,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "You may discard from your hand as many Technical Machine and Pokémon Tool cards as you like. This attack does 30 damage times the number of cards you discarded."
       },
       {
@@ -1493,8 +1493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/28_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "ex6-29",
@@ -1538,8 +1538,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/29_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -1595,8 +1595,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/30_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -1650,8 +1650,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/31_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1701,8 +1701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/32_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -1743,7 +1743,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -1753,8 +1753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/33_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -1808,8 +1808,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/34_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1862,8 +1862,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/35_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -1911,8 +1911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/36_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -1964,8 +1964,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/37_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -2016,8 +2016,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/38_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -2066,8 +2066,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/39_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -2119,8 +2119,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/40_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2152,7 +2152,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2173,8 +2173,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/41_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2227,8 +2227,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/42_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -2280,8 +2280,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/43_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "ex6-44",
@@ -2335,8 +2335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/44_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "ex6-45",
@@ -2388,8 +2388,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/45_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -2441,8 +2441,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/46_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -2494,8 +2494,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/47_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -2548,8 +2548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/48_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "ex6-49",
@@ -2600,8 +2600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/49_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "ex6-50",
@@ -2652,8 +2652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/50_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2705,8 +2705,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/51_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -2754,8 +2754,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/52_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "ex6-53",
@@ -2793,8 +2793,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/53_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -2845,8 +2845,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/54_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2897,8 +2897,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/55_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2948,8 +2948,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/56_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -2990,8 +2990,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/57_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3042,8 +3042,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/58_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3094,8 +3094,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/59_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -3146,8 +3146,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/60_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -3188,8 +3188,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/61_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -3246,8 +3246,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/62_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -3294,8 +3294,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/63_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -3348,8 +3348,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/64_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3400,8 +3400,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/65_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3452,8 +3452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/66_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -3504,8 +3504,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/67_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3562,8 +3562,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/68_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3614,8 +3614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/69_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3666,8 +3666,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/70_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -3707,7 +3707,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3717,8 +3717,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/71_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -3768,8 +3768,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/72_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -3826,8 +3826,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/73_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -3868,8 +3868,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/74_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3920,8 +3920,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/75_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -3963,8 +3963,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/76_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -4014,8 +4014,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/77_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4056,8 +4056,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/78_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -4107,8 +4107,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/79_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -4149,8 +4149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/80_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -4208,8 +4208,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/81_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4250,8 +4250,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/82_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -4302,8 +4302,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/83_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -4353,8 +4353,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/84_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -4401,8 +4401,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/85_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4452,8 +4452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex6/86_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -4817,8 +4817,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/104_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "ex6-105",
@@ -4883,8 +4883,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/105_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ex6-106",
@@ -4936,8 +4936,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/106_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "ex6-107",
@@ -4983,8 +4983,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/107_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ex6-108",
@@ -5051,8 +5051,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/108_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "ex6-109",
@@ -5108,8 +5108,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/109_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ex6-110",
@@ -5148,8 +5148,8 @@
         "text": "Count the number of cards in your opponent's hand. Put that many damage counters on the Defending Pokémon."
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/110_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "ex6-111",
@@ -5188,8 +5188,8 @@
         "text": "Count the number of cards in your opponent's hand. Put that many damage counters on the Defending Pokémon."
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/111_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "ex6-112",
@@ -5255,7 +5255,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex6/112_hires.png",
+    "nationalPokedexNumber": 3
   }
 ]
diff --git a/json/cards/Flashfire.json b/json/cards/Flashfire.json
index fd8df7e73..e4f000c7a 100644
--- a/json/cards/Flashfire.json
+++ b/json/cards/Flashfire.json
@@ -40,8 +40,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/1_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -90,8 +90,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/2_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -150,8 +150,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/3_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "xy2-4",
@@ -191,8 +191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/4_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -233,8 +233,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/5_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -287,8 +287,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/6_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -328,7 +328,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of Benched Pokémon (both yours and your opponent's)."
       }
     ],
@@ -338,8 +338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/7_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "xy2-8",
@@ -387,8 +387,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/8_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -441,8 +441,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/9_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "xy2-10",
@@ -480,7 +480,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -490,8 +490,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 556,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/10_hires.png",
+    "nationalPokedexNumber": 556
   },
   {
     "id": "xy2-11",
@@ -545,8 +545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/11_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -603,8 +603,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/12_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -652,8 +652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/13_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy2-14",
@@ -701,8 +701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/14_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -751,8 +751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/15_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "xy2-16",
@@ -802,8 +802,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/16_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "xy2-17",
@@ -848,8 +848,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 662,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/17_hires.png",
+    "nationalPokedexNumber": 662,
     "evolvesTo": [
       "Talonflame"
     ]
@@ -893,8 +893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 667,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/18_hires.png",
+    "nationalPokedexNumber": 667,
     "evolvesTo": [
       "Pyroar"
     ]
@@ -937,8 +937,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 667,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/19_hires.png",
+    "nationalPokedexNumber": 667,
     "evolvesTo": [
       "Pyroar"
     ]
@@ -988,8 +988,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 668,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/20_hires.png",
+    "nationalPokedexNumber": 668
   },
   {
     "id": "xy2-21",
@@ -1033,8 +1033,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 211,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/21_hires.png",
+    "nationalPokedexNumber": 211
   },
   {
     "id": "xy2-22",
@@ -1072,8 +1072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/22_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -1123,8 +1123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/23_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "xy2-24",
@@ -1164,8 +1164,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/24_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -1221,8 +1221,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/25_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -1281,8 +1281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/26_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "xy2-27",
@@ -1330,8 +1330,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/27_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "xy2-28",
@@ -1379,8 +1379,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/28_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -1432,8 +1432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/29_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "xy2-30",
@@ -1483,8 +1483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 712,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/30_hires.png",
+    "nationalPokedexNumber": 712,
     "evolvesTo": [
       "Avalugg"
     ]
@@ -1543,8 +1543,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 713,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/31_hires.png",
+    "nationalPokedexNumber": 713
   },
   {
     "id": "xy2-32",
@@ -1598,8 +1598,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/32_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -1642,7 +1642,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "This attack does 40 damage times the number of Prize cards your opponent has taken."
       }
     ],
@@ -1658,8 +1658,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/33_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -1719,8 +1719,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/34_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "xy2-35",
@@ -1781,8 +1781,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/35_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "xy2-36",
@@ -1836,8 +1836,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 694,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/36_hires.png",
+    "nationalPokedexNumber": 694,
     "evolvesTo": [
       "Heliolisk"
     ]
@@ -1896,8 +1896,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 695,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/37_hires.png",
+    "nationalPokedexNumber": 695
   },
   {
     "id": "xy2-38",
@@ -1950,8 +1950,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/38_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -2011,8 +2011,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/39_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -2069,8 +2069,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/40_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "xy2-41",
@@ -2123,8 +2123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/41_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "xy2-42",
@@ -2172,8 +2172,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 677,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/42_hires.png",
+    "nationalPokedexNumber": 677,
     "evolvesTo": [
       "Meowstic"
     ]
@@ -2226,8 +2226,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 678,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/43_hires.png",
+    "nationalPokedexNumber": 678
   },
   {
     "id": "xy2-44",
@@ -2265,8 +2265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 690,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/44_hires.png",
+    "nationalPokedexNumber": 690,
     "evolvesTo": [
       "Dragalge"
     ]
@@ -2308,7 +2308,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "This attack does 10 damage times the number of damage counters on this Pokémon."
       }
     ],
@@ -2318,8 +2318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/45_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -2377,8 +2377,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/46_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -2436,8 +2436,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/47_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "xy2-48",
@@ -2468,7 +2468,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2478,8 +2478,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 688,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/48_hires.png",
+    "nationalPokedexNumber": 688,
     "evolvesTo": [
       "Barbaracle"
     ]
@@ -2513,7 +2513,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard as many Fighting Energy cards as you like from your hand. This attack does 30 damage times the number of Energy cards you discarded."
       },
       {
@@ -2534,8 +2534,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 689,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/49_hires.png",
+    "nationalPokedexNumber": 689
   },
   {
     "id": "xy2-50",
@@ -2589,8 +2589,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/50_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -2647,8 +2647,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/51_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -2707,8 +2707,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/52_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "xy2-53",
@@ -2762,8 +2762,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/53_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -2821,8 +2821,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/54_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -2883,8 +2883,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 435,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/55_hires.png",
+    "nationalPokedexNumber": 435
   },
   {
     "id": "xy2-56",
@@ -2930,8 +2930,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/56_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -2975,7 +2975,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip 2 coins. This attack does 60 damage times the number of heads."
       }
     ],
@@ -2991,8 +2991,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/57_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -3025,7 +3025,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3041,8 +3041,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/58_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -3103,8 +3103,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 560,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/59_hires.png",
+    "nationalPokedexNumber": 560
   },
   {
     "id": "xy2-60",
@@ -3157,8 +3157,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/60_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "xy2-61",
@@ -3212,8 +3212,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 632,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/61_hires.png",
+    "nationalPokedexNumber": 632
   },
   {
     "id": "xy2-62",
@@ -3257,8 +3257,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 669,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/62_hires.png",
+    "nationalPokedexNumber": 669,
     "evolvesTo": [
       "Floette"
     ]
@@ -3305,8 +3305,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 669,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/63_hires.png",
+    "nationalPokedexNumber": 669,
     "evolvesTo": [
       "Floette"
     ]
@@ -3359,8 +3359,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 670,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/64_hires.png",
+    "nationalPokedexNumber": 670,
     "evolvesTo": [
       "Florges"
     ]
@@ -3418,8 +3418,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 670,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/65_hires.png",
+    "nationalPokedexNumber": 670,
     "evolvesTo": [
       "Florges"
     ]
@@ -3476,8 +3476,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 671,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/66_hires.png",
+    "nationalPokedexNumber": 671
   },
   {
     "id": "xy2-67",
@@ -3531,8 +3531,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 682,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/67_hires.png",
+    "nationalPokedexNumber": 682,
     "evolvesTo": [
       "Aromatisse"
     ]
@@ -3591,8 +3591,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 703,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/68_hires.png",
+    "nationalPokedexNumber": 703
   },
   {
     "id": "xy2-69",
@@ -3641,8 +3641,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/69_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy2-70",
@@ -3694,8 +3694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/70_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "xy2-71",
@@ -3741,8 +3741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 691,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/71_hires.png",
+    "nationalPokedexNumber": 691
   },
   {
     "id": "xy2-72",
@@ -3791,8 +3791,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 704,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/72_hires.png",
+    "nationalPokedexNumber": 704,
     "evolvesTo": [
       "Sliggoo"
     ]
@@ -3847,8 +3847,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 705,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/73_hires.png",
+    "nationalPokedexNumber": 705,
     "evolvesTo": [
       "Goodra"
     ]
@@ -3899,8 +3899,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 706,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/74_hires.png",
+    "nationalPokedexNumber": 706
   },
   {
     "id": "xy2-75",
@@ -3944,8 +3944,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/75_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -4003,8 +4003,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/76_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -4064,8 +4064,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/77_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "xy2-78",
@@ -4119,8 +4119,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/78_hires.png",
+    "nationalPokedexNumber": 115,
     "evolvesTo": "M Kangaskhan-EX"
   },
   {
@@ -4168,8 +4168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/79_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "xy2-80",
@@ -4218,8 +4218,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/80_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "xy2-81",
@@ -4267,8 +4267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/81_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -4310,7 +4310,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -4320,8 +4320,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/82_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "xy2-83",
@@ -4371,8 +4371,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/83_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "xy2-84",
@@ -4411,8 +4411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/84_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -4461,8 +4461,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/85_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "xy2-86",
@@ -4506,8 +4506,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/86_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -4560,8 +4560,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 676,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/87_hires.png",
+    "nationalPokedexNumber": 676
   },
   {
     "id": "xy2-88",
@@ -4836,8 +4836,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/100_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -4899,8 +4899,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/101_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "xy2-102",
@@ -4953,8 +4953,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/102_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "xy2-103",
@@ -5008,8 +5008,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy2/103_hires.png",
+    "nationalPokedexNumber": 115,
     "evolvesTo": "M Kangaskhan-EX"
   },
   {
@@ -5108,8 +5108,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/107_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy2-108",
@@ -5158,8 +5158,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/108_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "xy2-109",
@@ -5206,7 +5206,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy2/109_hires.png",
+    "nationalPokedexNumber": 115
   }
 ]
diff --git a/json/cards/Fossil.json b/json/cards/Fossil.json
index 0b756f141..eddf27897 100644
--- a/json/cards/Fossil.json
+++ b/json/cards/Fossil.json
@@ -50,8 +50,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/1_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "base3-2",
@@ -105,8 +105,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/2_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "base3-3",
@@ -145,8 +145,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/3_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "base3-4",
@@ -194,8 +194,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/4_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "base3-5",
@@ -242,8 +242,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/5_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "base3-6",
@@ -286,8 +286,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/6_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -341,8 +341,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/7_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "base3-8",
@@ -394,8 +394,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/8_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "base3-9",
@@ -448,8 +448,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/9_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "base3-10",
@@ -460,6 +460,7 @@
     "level": "12",
     "hp": "80",
     "retreatCost": [
+      "Colorless",
       "Colorless"
     ],
     "number": "10",
@@ -498,8 +499,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/10_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "base3-11",
@@ -553,8 +554,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/11_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -588,7 +589,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "You may discard any number of Energy cards attached to Moltres when you use this attack. If you do, discard that many cards from the top of your opponent's deck."
+        "text": "You may discard any number of R Energy cards attached to Moltres when you use this attack. If you do, discard that many cards from the top of your opponent's deck."
       },
       {
         "name": "Dive Bomb",
@@ -609,8 +610,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/12_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "base3-13",
@@ -658,8 +659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/13_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "base3-14",
@@ -702,8 +703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/14_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "base3-15",
@@ -746,8 +747,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/15_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "base3-16",
@@ -800,8 +801,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/16_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "base3-17",
@@ -855,8 +856,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/17_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "base3-18",
@@ -895,8 +896,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/18_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "base3-19",
@@ -944,8 +945,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/19_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "base3-20",
@@ -992,8 +993,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/20_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "base3-21",
@@ -1036,8 +1037,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/21_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1091,8 +1092,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/22_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "base3-23",
@@ -1144,8 +1145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/23_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "base3-24",
@@ -1198,8 +1199,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/24_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "base3-25",
@@ -1249,8 +1250,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/25_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "base3-26",
@@ -1304,8 +1305,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/26_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1339,7 +1340,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "You may discard any number of Energy cards attached to Moltres when you use this attack. If you do, discard that many cards from the top of your opponent's deck."
+        "text": "You may discard any number of R Energy cards attached to Moltres when you use this attack. If you do, discard that many cards from the top of your opponent's deck."
       },
       {
         "name": "Dive Bomb",
@@ -1360,8 +1361,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/27_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "base3-28",
@@ -1409,8 +1410,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/28_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "base3-29",
@@ -1453,8 +1454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/29_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "base3-30",
@@ -1497,8 +1498,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/30_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "base3-31",
@@ -1550,8 +1551,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/31_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "base3-32",
@@ -1603,8 +1604,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/32_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "base3-33",
@@ -1650,8 +1651,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/33_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -1710,8 +1711,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/34_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1765,8 +1766,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/35_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "base3-36",
@@ -1824,8 +1825,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/36_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "base3-37",
@@ -1878,8 +1879,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/37_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -1935,8 +1936,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/38_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "base3-39",
@@ -1986,8 +1987,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/39_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2041,8 +2042,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/40_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "base3-41",
@@ -2099,8 +2100,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/41_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "base3-42",
@@ -2152,8 +2153,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/42_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2202,8 +2203,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/43_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "base3-44",
@@ -2240,7 +2241,7 @@
           "Water"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20",
+        "damage": "10",
         "text": "The Defending Pokémon is now Poisoned."
       }
     ],
@@ -2250,8 +2251,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/44_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "base3-45",
@@ -2303,8 +2304,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base3/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base3/45_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "base3-46",
@@ -2353,8 +2354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/46_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -2397,8 +2398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/47_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -2449,8 +2450,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/48_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -2489,8 +2490,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/49_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -2537,8 +2538,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/50_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -2591,8 +2592,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/51_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -2639,8 +2640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/52_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -2691,8 +2692,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/53_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -2743,8 +2744,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/54_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -2796,8 +2797,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/55_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -2842,8 +2843,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/56_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -2899,8 +2900,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/base3/57_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
diff --git a/json/cards/Furious Fists.json b/json/cards/Furious Fists.json
index 0540b9d38..f077662c4 100644
--- a/json/cards/Furious Fists.json	
+++ b/json/cards/Furious Fists.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/1_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -101,8 +101,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/2_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -152,8 +152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/3_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "xy3-4",
@@ -208,8 +208,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/4_hires.png",
+    "nationalPokedexNumber": 214,
     "evolvesTo": "M Heracross-EX"
   },
   {
@@ -257,8 +257,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/5_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "xy3-6",
@@ -296,8 +296,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/6_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -350,8 +350,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/7_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "xy3-8",
@@ -391,8 +391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 616,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/8_hires.png",
+    "nationalPokedexNumber": 616,
     "evolvesTo": [
       "Accelgor"
     ]
@@ -441,8 +441,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 617,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/9_hires.png",
+    "nationalPokedexNumber": 617
   },
   {
     "id": "xy3-10",
@@ -491,8 +491,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/10_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -548,8 +548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/11_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "xy3-12",
@@ -588,8 +588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/12_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -643,8 +643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/13_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -700,8 +700,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/14_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "xy3-15",
@@ -750,8 +750,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/15_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -804,8 +804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/16_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -864,8 +864,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/17_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "xy3-18",
@@ -911,8 +911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/18_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "xy3-19",
@@ -962,8 +962,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/19_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "xy3-20",
@@ -1018,8 +1018,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/20_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "xy3-21",
@@ -1048,7 +1048,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -1069,8 +1069,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 613,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/21_hires.png",
+    "nationalPokedexNumber": 613,
     "evolvesTo": [
       "Beartic"
     ]
@@ -1128,8 +1128,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 614,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/22_hires.png",
+    "nationalPokedexNumber": 614
   },
   {
     "id": "xy3-23",
@@ -1178,8 +1178,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 692,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/23_hires.png",
+    "nationalPokedexNumber": 692,
     "evolvesTo": [
       "Clawitzer"
     ]
@@ -1233,8 +1233,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 693,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/24_hires.png",
+    "nationalPokedexNumber": 693
   },
   {
     "id": "xy3-25",
@@ -1288,8 +1288,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 698,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/25_hires.png",
+    "nationalPokedexNumber": 698,
     "evolvesTo": [
       "Aurorus"
     ]
@@ -1341,8 +1341,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 699,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/26_hires.png",
+    "nationalPokedexNumber": 699
   },
   {
     "id": "xy3-27",
@@ -1387,8 +1387,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/27_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1448,8 +1448,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/28_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "xy3-29",
@@ -1504,8 +1504,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/29_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1566,8 +1566,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/30_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "xy3-31",
@@ -1621,8 +1621,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/31_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "xy3-32",
@@ -1675,8 +1675,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/32_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "xy3-33",
@@ -1732,8 +1732,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/33_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "xy3-34",
@@ -1770,7 +1770,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the amount of Energy attached to your opponent's Active Pokémon."
       }
     ],
@@ -1786,8 +1786,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 702,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/34_hires.png",
+    "nationalPokedexNumber": 702
   },
   {
     "id": "xy3-35",
@@ -1836,8 +1836,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/35_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -1891,8 +1891,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/36_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "xy3-37",
@@ -1937,8 +1937,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/37_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "xy3-38",
@@ -1988,8 +1988,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 451,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/38_hires.png",
+    "nationalPokedexNumber": 451,
     "evolvesTo": [
       "Drapion"
     ]
@@ -2040,8 +2040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/39_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -2093,8 +2093,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 575,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/40_hires.png",
+    "nationalPokedexNumber": 575,
     "evolvesTo": [
       "Gothitelle"
     ]
@@ -2144,8 +2144,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 576,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/41_hires.png",
+    "nationalPokedexNumber": 576
   },
   {
     "id": "xy3-42",
@@ -2203,8 +2203,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 622,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/42_hires.png",
+    "nationalPokedexNumber": 622,
     "evolvesTo": [
       "Golurk"
     ]
@@ -2269,8 +2269,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/43_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "xy3-44",
@@ -2309,8 +2309,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/44_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -2354,8 +2354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/45_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2405,8 +2405,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/46_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xy3-47",
@@ -2454,8 +2454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/47_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "xy3-48",
@@ -2505,8 +2505,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/48_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "xy3-49",
@@ -2555,8 +2555,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/49_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "xy3-50",
@@ -2608,8 +2608,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/50_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "xy3-51",
@@ -2660,8 +2660,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/51_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -2713,8 +2713,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/52_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "xy3-53",
@@ -2762,8 +2762,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/53_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -2829,8 +2829,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/54_hires.png",
+    "nationalPokedexNumber": 448,
     "evolvesTo": "M Lucario-EX"
   },
   {
@@ -2876,8 +2876,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/55_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "xy3-55a",
@@ -2922,8 +2922,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/55a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/55a_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "xy3-56",
@@ -2971,8 +2971,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 619,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/56_hires.png",
+    "nationalPokedexNumber": 619,
     "evolvesTo": [
       "Mienshao"
     ]
@@ -3024,8 +3024,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 620,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/57_hires.png",
+    "nationalPokedexNumber": 620
   },
   {
     "id": "xy3-58",
@@ -3074,8 +3074,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/58_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "xy3-59",
@@ -3124,8 +3124,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 674,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/59_hires.png",
+    "nationalPokedexNumber": 674,
     "evolvesTo": [
       "Pangoro"
     ]
@@ -3158,7 +3158,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3168,8 +3168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 674,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/60_hires.png",
+    "nationalPokedexNumber": 674,
     "evolvesTo": [
       "Pangoro"
     ]
@@ -3226,8 +3226,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 696,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/61_hires.png",
+    "nationalPokedexNumber": 696,
     "evolvesTo": [
       "Tyrantrum"
     ]
@@ -3285,8 +3285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 697,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/62_hires.png",
+    "nationalPokedexNumber": 697
   },
   {
     "id": "xy3-63",
@@ -3332,8 +3332,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 701,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/63_hires.png",
+    "nationalPokedexNumber": 701
   },
   {
     "id": "xy3-64",
@@ -3387,8 +3387,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 701,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/64_hires.png",
+    "nationalPokedexNumber": 701
   },
   {
     "id": "xy3-65",
@@ -3447,8 +3447,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/65_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "xy3-66",
@@ -3494,8 +3494,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/66_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -3539,7 +3539,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 2,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 3 coins. This attack does 50 damage times the number of heads. This Pokémon is now Confused."
       }
     ],
@@ -3555,8 +3555,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 560,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/67_hires.png",
+    "nationalPokedexNumber": 560
   },
   {
     "id": "xy3-68",
@@ -3615,8 +3615,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 675,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/68_hires.png",
+    "nationalPokedexNumber": 675
   },
   {
     "id": "xy3-69",
@@ -3670,8 +3670,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/69_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -3718,8 +3718,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/70_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -3778,8 +3778,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/71_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "xy3-72",
@@ -3835,8 +3835,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 700,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/72_hires.png",
+    "nationalPokedexNumber": 700
   },
   {
     "id": "xy3-73",
@@ -3886,8 +3886,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 707,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/73_hires.png",
+    "nationalPokedexNumber": 707
   },
   {
     "id": "xy3-74",
@@ -3937,8 +3937,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/74_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "xy3-75",
@@ -3987,8 +3987,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/75_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -4041,8 +4041,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/76_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "xy3-77",
@@ -4088,8 +4088,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 715,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/77_hires.png",
+    "nationalPokedexNumber": 715
   },
   {
     "id": "xy3-78",
@@ -4131,8 +4131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/78_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -4191,8 +4191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 463,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/79_hires.png",
+    "nationalPokedexNumber": 463
   },
   {
     "id": "xy3-80",
@@ -4236,8 +4236,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/80_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4288,8 +4288,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/81_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -4343,8 +4343,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/82_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -4403,8 +4403,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/83_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "xy3-84",
@@ -4442,8 +4442,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/84_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -4495,8 +4495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 505,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/85_hires.png",
+    "nationalPokedexNumber": 505
   },
   {
     "id": "xy3-86",
@@ -4552,8 +4552,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/86_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "xy3-87",
@@ -4607,8 +4607,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 714,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/87_hires.png",
+    "nationalPokedexNumber": 714,
     "evolvesTo": [
       "Noivern"
     ]
@@ -4955,8 +4955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/105_hires.png",
+    "nationalPokedexNumber": 214,
     "evolvesTo": "M Heracross-EX"
   },
   {
@@ -5012,8 +5012,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/106_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "xy3-107",
@@ -5076,8 +5076,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy3/107_hires.png",
+    "nationalPokedexNumber": 448,
     "evolvesTo": "M Lucario-EX"
   },
   {
@@ -5128,8 +5128,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/108_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "xy3-109",
@@ -5227,8 +5227,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/112_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "xy3-113",
@@ -5273,7 +5273,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy3/113_hires.png",
+    "nationalPokedexNumber": 448
   }
 ]
diff --git a/json/cards/Generations.json b/json/cards/Generations.json
index 050608dac..14acb45cb 100644
--- a/json/cards/Generations.json
+++ b/json/cards/Generations.json
@@ -55,8 +55,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/1_hires.png",
+    "nationalPokedexNumber": 3,
     "evolvesTo": "M Venusaur-EX"
   },
   {
@@ -106,8 +106,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/2_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "g1-3",
@@ -150,8 +150,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/3_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -200,8 +200,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/4_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -260,8 +260,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/5_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "g1-6",
@@ -299,8 +299,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/6_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -353,8 +353,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/7_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "g1-8",
@@ -405,8 +405,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/8_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -459,8 +459,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/9_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "g1-10",
@@ -514,8 +514,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/10_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "g1-11",
@@ -570,8 +570,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/11_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -620,8 +620,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/12_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "g1-13",
@@ -674,8 +674,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/13_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "g1-14",
@@ -723,8 +723,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/14_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -773,8 +773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/15_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "g1-16",
@@ -823,8 +823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/16_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -884,8 +884,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/17_hires.png",
+    "nationalPokedexNumber": 9,
     "evolvesTo": "M Blastoise-EX"
   },
   {
@@ -934,8 +934,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/18_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "g1-19",
@@ -974,8 +974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/19_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -1031,8 +1031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/20_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "g1-21",
@@ -1041,6 +1041,10 @@
     "subtype": "Basic",
     "supertype": "Pokémon",
     "hp": "70",
+    "retreatCost": [
+      "Colorless",
+      "Colorless"
+    ],
     "number": "21",
     "artist": "kirisAki",
     "rarity": "Common",
@@ -1078,8 +1082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/21_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -1120,8 +1124,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/22_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -1179,8 +1183,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/23_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "g1-24",
@@ -1235,8 +1239,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/24_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "g1-25",
@@ -1292,8 +1296,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/25_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "g1-26",
@@ -1347,8 +1351,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/26_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1405,8 +1409,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/27_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "g1-28",
@@ -1461,8 +1465,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/28_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "g1-28a",
@@ -1517,8 +1521,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/28a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/28a_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "g1-29",
@@ -1574,8 +1578,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/29_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "g1-30",
@@ -1619,8 +1623,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/30_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -1670,8 +1674,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/31_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1722,8 +1726,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/32_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -1771,8 +1775,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/33_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -1826,8 +1830,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/34_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1882,8 +1886,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/35_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "g1-36",
@@ -1928,8 +1932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/36_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "g1-37",
@@ -1976,8 +1980,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 678,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/37_hires.png",
+    "nationalPokedexNumber": 678
   },
   {
     "id": "g1-38",
@@ -2025,8 +2029,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/38_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -2079,8 +2083,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/39_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "g1-40",
@@ -2119,8 +2123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/40_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -2164,8 +2168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/41_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2215,8 +2219,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/42_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "g1-43",
@@ -2265,8 +2269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/43_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -2324,8 +2328,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/44_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -2383,8 +2387,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/45_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "g1-46",
@@ -2442,8 +2446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/46_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "g1-47",
@@ -2491,8 +2495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/47_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "g1-48",
@@ -2542,8 +2546,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/48_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "g1-49",
@@ -2584,8 +2588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/49_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -2642,8 +2646,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/50_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -2677,7 +2681,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Switch 1 of your opponent's Benched Pokémon with his or her Active Pokémon."
+        "text": "Switch 1 of your opponent's Benched Pokémon with your opponent's Active Pokémon."
       },
       {
         "name": "Moonblast",
@@ -2702,8 +2706,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/51_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "g1-52",
@@ -2753,8 +2757,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/52_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "g1-53",
@@ -2792,8 +2796,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/53_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -2845,8 +2849,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/54_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "g1-55",
@@ -2900,8 +2904,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/55_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -2956,8 +2960,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/56_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "g1-57",
@@ -3007,8 +3011,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/57_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "g1-58",
@@ -3057,8 +3061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/58_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "g1-59",
@@ -3521,8 +3525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC1_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -3564,8 +3568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC2_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -3608,8 +3612,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC3_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3663,8 +3667,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC4_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -3720,8 +3724,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC5_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "g1-rc6",
@@ -3770,8 +3774,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC6_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "g1-rc7",
@@ -3809,8 +3813,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC7_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -3861,8 +3865,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 478,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC8_hires.png",
+    "nationalPokedexNumber": 478
   },
   {
     "id": "g1-rc9",
@@ -3916,8 +3920,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC9_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "g1-rc10",
@@ -3970,8 +3974,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 702,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC10_hires.png",
+    "nationalPokedexNumber": 702
   },
   {
     "id": "g1-rc11",
@@ -4016,8 +4020,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC11_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "g1-rc12",
@@ -4057,8 +4061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC12_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -4110,8 +4114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC13_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "g1-rc14",
@@ -4149,8 +4153,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 677,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC14_hires.png",
+    "nationalPokedexNumber": 677,
     "evolvesTo": [
       "Meowstic"
     ]
@@ -4203,8 +4207,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 678,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC15_hires.png",
+    "nationalPokedexNumber": 678
   },
   {
     "id": "g1-rc16",
@@ -4260,8 +4264,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC16_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "g1-rc17",
@@ -4305,8 +4309,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 669,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC17_hires.png",
+    "nationalPokedexNumber": 669,
     "evolvesTo": [
       "Floette"
     ]
@@ -4364,8 +4368,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 670,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC18_hires.png",
+    "nationalPokedexNumber": 670,
     "evolvesTo": [
       "Florges"
     ]
@@ -4422,8 +4426,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 684,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC19_hires.png",
+    "nationalPokedexNumber": 684,
     "evolvesTo": [
       "Slurpuff"
     ]
@@ -4483,8 +4487,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 685,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC20_hires.png",
+    "nationalPokedexNumber": 685
   },
   {
     "id": "g1-rc21",
@@ -4544,8 +4548,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 700,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC21_hires.png",
+    "nationalPokedexNumber": 700
   },
   {
     "id": "g1-rc22",
@@ -4600,8 +4604,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 719,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC22_hires.png",
+    "nationalPokedexNumber": 719
   },
   {
     "id": "g1-rc23",
@@ -4645,8 +4649,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC23_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -4704,8 +4708,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC24_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "g1-rc25",
@@ -4749,8 +4753,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC25_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -4836,8 +4840,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC28_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "g1-rc29",
@@ -4891,8 +4895,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC29_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4954,8 +4958,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC30_hires.png",
+    "nationalPokedexNumber": 282,
     "evolvesTo": "M Gardevoir-EX"
   },
   {
@@ -5008,8 +5012,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC31_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "g1-rc32",
@@ -5069,7 +5073,7 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 700,
-    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/g1/RC32_hires.png",
+    "nationalPokedexNumber": 700
   }
 ]
diff --git a/json/cards/Great Encounters.json b/json/cards/Great Encounters.json
index 788bd864d..bb1f46693 100644
--- a/json/cards/Great Encounters.json	
+++ b/json/cards/Great Encounters.json	
@@ -48,8 +48,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/1_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "dp4-2",
@@ -99,8 +99,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/2_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "dp4-3",
@@ -156,8 +156,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/3_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "dp4-4",
@@ -213,8 +213,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/4_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "dp4-5",
@@ -268,8 +268,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/5_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "dp4-6",
@@ -306,7 +306,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 3 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -316,8 +316,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/6_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "dp4-7",
@@ -373,8 +373,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/7_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "dp4-8",
@@ -430,8 +430,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/8_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "dp4-9",
@@ -480,8 +480,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/9_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "dp4-10",
@@ -540,8 +540,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/10_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "dp4-11",
@@ -594,8 +594,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/11_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "dp4-12",
@@ -652,8 +652,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/12_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "dp4-13",
@@ -680,7 +680,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of Beedrill you have in play."
       },
       {
@@ -691,7 +691,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -701,8 +701,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/13_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "dp4-14",
@@ -750,8 +750,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/14_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "dp4-15",
@@ -798,8 +798,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/15_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "dp4-16",
@@ -856,8 +856,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/16_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "dp4-17",
@@ -912,8 +912,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/17_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "dp4-18",
@@ -969,8 +969,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/18_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "dp4-19",
@@ -1023,8 +1023,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/19_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "dp4-20",
@@ -1078,8 +1078,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/20_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "dp4-21",
@@ -1128,8 +1128,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/21_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "dp4-22",
@@ -1185,8 +1185,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/22_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "dp4-23",
@@ -1244,8 +1244,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/23_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "dp4-24",
@@ -1300,8 +1300,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/24_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "dp4-25",
@@ -1349,8 +1349,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/25_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "dp4-26",
@@ -1401,8 +1401,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/26_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "dp4-27",
@@ -1449,8 +1449,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/27_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "dp4-28",
@@ -1497,8 +1497,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/28_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "dp4-29",
@@ -1542,8 +1542,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/29_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp4-30",
@@ -1594,8 +1594,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/30_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "dp4-31",
@@ -1642,8 +1642,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/31_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "dp4-32",
@@ -1689,8 +1689,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/32_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "dp4-33",
@@ -1742,8 +1742,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/33_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "dp4-34",
@@ -1774,7 +1774,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -1801,8 +1801,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/34_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "dp4-35",
@@ -1843,7 +1843,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -1853,8 +1853,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/35_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1905,8 +1905,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/36_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "dp4-37",
@@ -1958,8 +1958,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/37_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "dp4-38",
@@ -2006,8 +2006,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 368,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/38_hires.png",
+    "nationalPokedexNumber": 368
   },
   {
     "id": "dp4-39",
@@ -2061,8 +2061,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/39_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "dp4-40",
@@ -2118,8 +2118,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/40_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -2176,8 +2176,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/41_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "dp4-42",
@@ -2227,8 +2227,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 367,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/42_hires.png",
+    "nationalPokedexNumber": 367
   },
   {
     "id": "dp4-43",
@@ -2276,8 +2276,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 264,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/43_hires.png",
+    "nationalPokedexNumber": 264
   },
   {
     "id": "dp4-44",
@@ -2330,8 +2330,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/44_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -2383,8 +2383,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/45_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "dp4-46",
@@ -2437,8 +2437,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/46_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -2488,8 +2488,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/47_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -2533,7 +2533,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of Energy cards attached to Pelipper. Then, put all Energy cards attached to Pelipper on top of your deck. Shuffle your deck afterward."
       }
     ],
@@ -2549,8 +2549,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/48_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "dp4-49",
@@ -2597,8 +2597,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/49_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -2644,7 +2644,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 3 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -2654,8 +2654,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 432,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/50_hires.png",
+    "nationalPokedexNumber": 432
   },
   {
     "id": "dp4-51",
@@ -2704,8 +2704,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/51_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "dp4-52",
@@ -2756,8 +2756,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/52_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "dp4-53",
@@ -2813,8 +2813,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/53_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "dp4-54",
@@ -2867,8 +2867,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/54_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "dp4-55",
@@ -2926,8 +2926,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/55_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -2974,8 +2974,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/56_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp4-57",
@@ -3020,8 +3020,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/57_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp4-58",
@@ -3074,8 +3074,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/58_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -3128,8 +3128,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/59_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "dp4-60",
@@ -3178,8 +3178,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/60_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -3231,8 +3231,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/61_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -3290,8 +3290,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/62_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -3338,8 +3338,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/63_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -3391,8 +3391,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 366,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/64_hires.png",
+    "nationalPokedexNumber": 366,
     "evolvesTo": [
       "Huntail",
       "Gorebyss"
@@ -3445,8 +3445,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/65_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -3498,8 +3498,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/66_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -3550,8 +3550,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/67_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -3603,8 +3603,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 431,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/68_hires.png",
+    "nationalPokedexNumber": 431,
     "evolvesTo": [
       "Purugly"
     ]
@@ -3656,8 +3656,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/69_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3704,8 +3704,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 174,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/70_hires.png",
+    "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
     ]
@@ -3753,8 +3753,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/71_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "dp4-72",
@@ -3803,8 +3803,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/72_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3857,8 +3857,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/73_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -3911,8 +3911,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/74_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3965,8 +3965,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/75_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -4013,8 +4013,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/76_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "dp4-77",
@@ -4062,8 +4062,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/77_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "dp4-78",
@@ -4113,8 +4113,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/78_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -4166,8 +4166,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/79_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -4220,8 +4220,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/80_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -4273,8 +4273,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/81_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -4326,8 +4326,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/82_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -4381,8 +4381,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/83_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -4435,8 +4435,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/84_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -4483,8 +4483,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/85_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "dp4-86",
@@ -4539,8 +4539,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/86_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -4593,8 +4593,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/87_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -4645,8 +4645,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/88_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -4697,8 +4697,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/89_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -4756,8 +4756,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/90_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -4805,8 +4805,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/91_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp4-92",
@@ -4851,8 +4851,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/92_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "dp4-93",
@@ -4900,8 +4900,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/93_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -4952,8 +4952,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/94_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -5011,8 +5011,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/95_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -5053,7 +5053,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -5063,8 +5063,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 263,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp4/96_hires.png",
+    "nationalPokedexNumber": 263,
     "evolvesTo": [
       "Linoone"
     ]
@@ -5227,8 +5227,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/103_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "dp4-104",
@@ -5283,8 +5283,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/104_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "dp4-105",
@@ -5341,8 +5341,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/105_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "dp4-106",
@@ -5393,7 +5393,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp4/106_hires.png",
+    "nationalPokedexNumber": 484
   }
 ]
diff --git a/json/cards/Guardians Rising.json b/json/cards/Guardians Rising.json
index 6126d2bca..83f803532 100644
--- a/json/cards/Guardians Rising.json	
+++ b/json/cards/Guardians Rising.json	
@@ -7208,8 +7208,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 724,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm2/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm2/146_hires.png",
+    "nationalPokedexNumber": 724
   },
   {
     "id": "sm2-147",
@@ -7276,8 +7276,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 727,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm2/147_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm2/147_hires.png",
+    "nationalPokedexNumber": 727
   },
   {
     "id": "sm2-148",
@@ -7410,8 +7410,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 730,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm2/149_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm2/149_hires.png",
+    "nationalPokedexNumber": 730
   },
   {
     "id": "sm2-150",
diff --git a/json/cards/Gym Challenge.json b/json/cards/Gym Challenge.json
index b439c3cf2..e24ed58a2 100644
--- a/json/cards/Gym Challenge.json	
+++ b/json/cards/Gym Challenge.json	
@@ -53,8 +53,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/1_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "gym2-2",
@@ -112,8 +112,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/2_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "gym2-3",
@@ -159,8 +159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/3_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "gym2-4",
@@ -213,8 +213,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/4_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "gym2-5",
@@ -274,8 +274,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/5_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "gym2-6",
@@ -325,8 +325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/6_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "gym2-7",
@@ -380,8 +380,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/7_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "gym2-8",
@@ -431,8 +431,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/8_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "gym2-9",
@@ -487,8 +487,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/9_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "gym2-10",
@@ -542,8 +542,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/10_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "gym2-11",
@@ -597,8 +597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/11_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "gym2-12",
@@ -649,8 +649,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/12_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "gym2-13",
@@ -706,8 +706,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/13_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "gym2-14",
@@ -769,8 +769,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/14_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "gym2-15",
@@ -822,8 +822,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/15_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "gym2-16",
@@ -873,8 +873,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/16_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "gym2-17",
@@ -989,8 +989,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/21_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "gym2-22",
@@ -1047,8 +1047,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/22_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "gym2-23",
@@ -1104,8 +1104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/23_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "gym2-24",
@@ -1157,8 +1157,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/24_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "gym2-25",
@@ -1209,8 +1209,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/25_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "gym2-26",
@@ -1259,8 +1259,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/26_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "gym2-27",
@@ -1317,8 +1317,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/27_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -1373,8 +1373,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/28_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "gym2-29",
@@ -1427,8 +1427,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/29_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "gym2-30",
@@ -1481,8 +1481,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/30_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "gym2-31",
@@ -1535,8 +1535,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/31_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1586,8 +1586,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/32_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "gym2-33",
@@ -1635,8 +1635,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/33_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "gym2-34",
@@ -1689,8 +1689,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/34_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -1740,8 +1740,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/35_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "gym2-36",
@@ -1798,8 +1798,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/36_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "gym2-37",
@@ -1848,8 +1848,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/37_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -1896,8 +1896,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/38_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -1949,8 +1949,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/39_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2008,8 +2008,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/40_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -2060,8 +2060,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/41_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -2116,8 +2116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/42_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2175,8 +2175,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/43_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -2232,8 +2232,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/44_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2279,8 +2279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/45_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2341,8 +2341,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/46_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -2391,8 +2391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/47_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -2444,8 +2444,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/48_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -2503,8 +2503,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/49_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -2560,8 +2560,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/50_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "gym2-51",
@@ -2616,8 +2616,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/51_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2675,8 +2675,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/52_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "gym2-53",
@@ -2732,8 +2732,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/53_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "gym2-54",
@@ -2787,8 +2787,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/54_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "gym2-55",
@@ -2837,8 +2837,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/55_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2892,8 +2892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/56_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "gym2-57",
@@ -2942,8 +2942,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/57_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "gym2-58",
@@ -2994,8 +2994,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/58_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -3038,8 +3038,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym2/59_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "gym2-60",
@@ -3078,8 +3078,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/60_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3134,8 +3134,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/61_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -3188,8 +3188,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/62_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3237,8 +3237,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/63_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -3281,8 +3281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/64_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -3342,8 +3342,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/65_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3394,8 +3394,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/66_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3453,8 +3453,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/67_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -3496,8 +3496,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/68_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -3555,8 +3555,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/69_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3598,8 +3598,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/70_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3651,8 +3651,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/71_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -3704,8 +3704,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/72_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3757,8 +3757,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/73_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3818,8 +3818,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/74_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3871,8 +3871,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/75_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -3923,8 +3923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/76_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -3966,8 +3966,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/77_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -4019,8 +4019,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/78_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -4062,8 +4062,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/79_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -4122,8 +4122,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/80_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -4176,8 +4176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/81_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -4229,8 +4229,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/82_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -4276,8 +4276,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/83_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -4317,8 +4317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/84_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4373,8 +4373,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/85_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4417,8 +4417,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/86_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4458,8 +4458,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/87_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -4510,8 +4510,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/88_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -4563,8 +4563,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/89_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -4606,8 +4606,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/90_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -4659,8 +4659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/91_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -4702,8 +4702,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/92_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4752,8 +4752,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/93_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -4804,8 +4804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/94_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -4857,8 +4857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/95_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -4907,8 +4907,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/96_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -4956,8 +4956,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/97_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -5015,8 +5015,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/98_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -5067,8 +5067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym2/99_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
diff --git a/json/cards/Gym Heroes.json b/json/cards/Gym Heroes.json
index c9879a2f8..8352ec138 100644
--- a/json/cards/Gym Heroes.json	
+++ b/json/cards/Gym Heroes.json	
@@ -42,8 +42,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/1_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "gym1-2",
@@ -99,8 +99,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/2_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -161,8 +161,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/3_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "gym1-4",
@@ -217,8 +217,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/4_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -269,8 +269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/5_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "gym1-6",
@@ -320,8 +320,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/6_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -379,8 +379,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/7_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "gym1-8",
@@ -428,8 +428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/8_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -483,8 +483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/9_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -532,8 +532,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/10_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "gym1-11",
@@ -584,8 +584,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/11_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "gym1-12",
@@ -627,8 +627,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/12_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "gym1-13",
@@ -684,8 +684,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/13_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -739,8 +739,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/14_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "gym1-15",
@@ -882,8 +882,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/20_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "gym1-21",
@@ -935,8 +935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/21_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -997,8 +997,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/22_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -1058,8 +1058,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/23_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "gym1-24",
@@ -1111,8 +1111,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/24_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -1171,8 +1171,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/25_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -1223,8 +1223,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/26_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "gym1-27",
@@ -1275,8 +1275,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/27_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1333,8 +1333,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/28_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "gym1-29",
@@ -1382,8 +1382,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/29_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "gym1-30",
@@ -1419,8 +1419,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/30_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -1468,8 +1468,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/31_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "gym1-32",
@@ -1515,8 +1515,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/32_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -1575,8 +1575,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/33_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "gym1-34",
@@ -1632,8 +1632,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/34_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "gym1-35",
@@ -1682,8 +1682,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/35_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -1744,8 +1744,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/36_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "gym1-37",
@@ -1797,8 +1797,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/37_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -1850,8 +1850,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/38_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -1911,8 +1911,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/39_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1958,8 +1958,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/40_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -2021,8 +2021,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/41_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -2070,8 +2070,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/42_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2123,8 +2123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/43_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -2179,8 +2179,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/44_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "gym1-45",
@@ -2228,8 +2228,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/45_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -2285,8 +2285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/46_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -2335,8 +2335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/47_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -2389,8 +2389,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/48_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -2446,8 +2446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/49_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -2500,8 +2500,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/50_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2550,8 +2550,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/51_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "gym1-52",
@@ -2593,8 +2593,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/52_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -2650,8 +2650,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/53_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -2703,8 +2703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/54_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -2757,8 +2757,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/55_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "gym1-56",
@@ -2810,8 +2810,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/56_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "gym1-57",
@@ -2851,8 +2851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/57_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -2893,8 +2893,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/58_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2947,8 +2947,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/59_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "gym1-60",
@@ -3000,8 +3000,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/60_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "gym1-61",
@@ -3050,8 +3050,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/61_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3094,8 +3094,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/62_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3135,8 +3135,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/63_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -3196,8 +3196,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/64_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "gym1-65",
@@ -3243,8 +3243,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/65_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3296,8 +3296,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/66_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -3345,8 +3345,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/67_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -3395,8 +3395,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/68_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -3451,8 +3451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/69_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3503,8 +3503,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/70_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3562,8 +3562,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/71_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -3612,8 +3612,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/72_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -3665,8 +3665,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/73_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3721,8 +3721,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/74_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -3774,8 +3774,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/75_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -3817,8 +3817,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/76_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -3870,8 +3870,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/77_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -3923,8 +3923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/78_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3978,8 +3978,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/79_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -4031,8 +4031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/80_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -4085,8 +4085,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/81_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4144,8 +4144,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/82_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4200,8 +4200,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/83_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4253,8 +4253,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/84_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4305,8 +4305,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/85_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -4355,8 +4355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/86_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -4408,8 +4408,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/87_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -4452,8 +4452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/88_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -4505,8 +4505,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/89_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -4549,8 +4549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/90_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4589,8 +4589,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/91_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -4642,8 +4642,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/92_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -4686,8 +4686,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/93_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -4740,8 +4740,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/gym1/94_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "gym1-95",
@@ -4781,8 +4781,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/95_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -4835,8 +4835,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/gym1/96_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
diff --git "a/json/cards/HS\342\200\224Triumphant.json" "b/json/cards/HS\342\200\224Triumphant.json"
index c65b1facb..3c2928668 100644
--- "a/json/cards/HS\342\200\224Triumphant.json"
+++ "b/json/cards/HS\342\200\224Triumphant.json"
@@ -59,8 +59,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/1_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "hgss4-2",
@@ -113,8 +113,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/2_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "hgss4-3",
@@ -162,8 +162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/3_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "hgss4-4",
@@ -224,8 +224,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/4_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "hgss4-5",
@@ -281,8 +281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 473,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/5_hires.png",
+    "nationalPokedexNumber": 473
   },
   {
     "id": "hgss4-6",
@@ -337,8 +337,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/6_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "hgss4-7",
@@ -385,8 +385,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/7_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "hgss4-8",
@@ -432,8 +432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/8_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "hgss4-9",
@@ -476,8 +476,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/9_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "hgss4-10",
@@ -520,8 +520,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/10_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "hgss4-11",
@@ -566,8 +566,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/11_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "hgss4-12",
@@ -613,8 +613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/12_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "hgss4-13",
@@ -664,8 +664,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 424,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/13_hires.png",
+    "nationalPokedexNumber": 424
   },
   {
     "id": "hgss4-14",
@@ -721,8 +721,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/14_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "hgss4-15",
@@ -779,8 +779,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/15_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "hgss4-16",
@@ -836,8 +836,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/16_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "hgss4-17",
@@ -881,8 +881,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/17_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "hgss4-18",
@@ -944,8 +944,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/18_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "hgss4-19",
@@ -998,8 +998,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/19_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "hgss4-20",
@@ -1057,8 +1057,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/20_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "hgss4-21",
@@ -1092,8 +1092,8 @@
         "text": "Choose 1 of your opponent's Pokémon. This attack does 20 damage to that Pokémon. This attack's damage isn't affected by Weakness or Resistance. Elekid is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 239,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/21_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
     ]
@@ -1141,8 +1141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/22_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "hgss4-23",
@@ -1194,8 +1194,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/23_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "hgss4-24",
@@ -1246,8 +1246,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 402,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/24_hires.png",
+    "nationalPokedexNumber": 402
   },
   {
     "id": "hgss4-25",
@@ -1295,8 +1295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/25_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "hgss4-26",
@@ -1347,8 +1347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/26_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "hgss4-27",
@@ -1399,8 +1399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/27_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "hgss4-28",
@@ -1451,8 +1451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/28_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "hgss4-29",
@@ -1506,8 +1506,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/29_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "hgss4-30",
@@ -1557,8 +1557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/30_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "hgss4-31",
@@ -1613,8 +1613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/31_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "hgss4-32",
@@ -1665,8 +1665,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/32_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1725,8 +1725,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/33_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1785,8 +1785,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/34_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "hgss4-35",
@@ -1838,8 +1838,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/35_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1894,8 +1894,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/36_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "hgss4-37",
@@ -1944,8 +1944,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/37_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2000,8 +2000,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 463,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/38_hires.png",
+    "nationalPokedexNumber": 463
   },
   {
     "id": "hgss4-39",
@@ -2048,8 +2048,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/39_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "hgss4-40",
@@ -2100,8 +2100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/40_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2138,8 +2138,8 @@
         "text": "The Defending Pokémon is now Burned. Magby is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/41_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -2192,8 +2192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/42_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2251,8 +2251,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/43_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2311,8 +2311,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/44_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "hgss4-45",
@@ -2363,8 +2363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/45_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2418,8 +2418,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/46_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2479,8 +2479,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/47_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -2538,8 +2538,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/48_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -2587,8 +2587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/49_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -2642,8 +2642,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/50_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "hgss4-51",
@@ -2686,8 +2686,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/51_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "hgss4-52",
@@ -2741,8 +2741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/52_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -2794,8 +2794,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/53_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -2854,8 +2854,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/54_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "hgss4-55",
@@ -2902,8 +2902,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/55_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -2962,8 +2962,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/56_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -3013,8 +3013,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/57_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -3071,8 +3071,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/58_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3122,8 +3122,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/59_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -3176,8 +3176,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/60_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -3234,8 +3234,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/61_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -3286,8 +3286,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/62_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -3334,8 +3334,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/63_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -3385,8 +3385,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/64_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "hgss4-65",
@@ -3425,8 +3425,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 401,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/65_hires.png",
+    "nationalPokedexNumber": 401,
     "evolvesTo": [
       "Kricketune"
     ]
@@ -3479,8 +3479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/66_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -3533,8 +3533,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/67_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3591,8 +3591,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/68_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3643,8 +3643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/69_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -3695,8 +3695,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/70_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -3752,8 +3752,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/71_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -3804,8 +3804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/72_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -3856,8 +3856,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/73_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -3898,8 +3898,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/74_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -3955,8 +3955,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/75_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -3998,8 +3998,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 451,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/76_hires.png",
+    "nationalPokedexNumber": 451,
     "evolvesTo": [
       "Drapion"
     ]
@@ -4040,8 +4040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/77_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -4088,8 +4088,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/78_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -4141,8 +4141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/79_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -4183,8 +4183,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/80_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -4226,8 +4226,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/81_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -4279,8 +4279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/82_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "hgss4-83",
@@ -4324,8 +4324,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/83_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4378,8 +4378,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/84_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -4538,8 +4538,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/91_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "hgss4-92",
@@ -4584,8 +4584,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/92_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "hgss4-93",
@@ -4636,8 +4636,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/93_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "hgss4-94",
@@ -4694,8 +4694,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/94_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "hgss4-95",
@@ -4755,8 +4755,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/95_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "hgss4-96",
@@ -4809,8 +4809,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/96_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "hgss4-97",
@@ -4850,8 +4850,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/97_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "hgss4-98",
@@ -4910,8 +4910,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/98_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "hgss4-99",
@@ -4933,8 +4933,8 @@
       "Darkness",
       "Psychic"
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/99_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "hgss4-100",
@@ -4993,8 +4993,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/100_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "hgss4-101",
@@ -5016,8 +5016,8 @@
       "Water",
       "Metal"
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/101_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "hgss4-102",
@@ -5078,8 +5078,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss4/102_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "hgss4-FOUR",
diff --git "a/json/cards/HS\342\200\224Undaunted.json" "b/json/cards/HS\342\200\224Undaunted.json"
index 18e62f81a..3632b2c25 100644
--- "a/json/cards/HS\342\200\224Undaunted.json"
+++ "b/json/cards/HS\342\200\224Undaunted.json"
@@ -48,8 +48,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/1_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "hgss3-2",
@@ -98,8 +98,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/2_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "hgss3-3",
@@ -158,8 +158,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/3_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "hgss3-4",
@@ -215,8 +215,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/4_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "hgss3-5",
@@ -271,8 +271,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/5_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "hgss3-6",
@@ -325,8 +325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/6_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "hgss3-7",
@@ -383,8 +383,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/7_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "hgss3-8",
@@ -428,8 +428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/8_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "hgss3-9",
@@ -486,8 +486,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/9_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "hgss3-10",
@@ -542,8 +542,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/10_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "hgss3-11",
@@ -594,8 +594,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/11_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "hgss3-12",
@@ -649,8 +649,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/12_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "hgss3-13",
@@ -706,8 +706,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/13_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "hgss3-14",
@@ -762,8 +762,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/14_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "hgss3-15",
@@ -820,8 +820,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/15_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "hgss3-16",
@@ -879,8 +879,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/16_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "hgss3-17",
@@ -934,8 +934,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/17_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "hgss3-18",
@@ -997,8 +997,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/18_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "hgss3-19",
@@ -1053,8 +1053,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/19_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "hgss3-20",
@@ -1103,8 +1103,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/20_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "hgss3-21",
@@ -1159,8 +1159,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/21_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "hgss3-22",
@@ -1216,8 +1216,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/22_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "hgss3-23",
@@ -1265,8 +1265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/23_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "hgss3-24",
@@ -1313,8 +1313,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/24_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "hgss3-25",
@@ -1362,8 +1362,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/25_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "hgss3-26",
@@ -1413,8 +1413,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/26_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "hgss3-27",
@@ -1454,8 +1454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/27_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -1512,8 +1512,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/28_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "hgss3-29",
@@ -1571,8 +1571,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/29_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -1633,8 +1633,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/30_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -1689,8 +1689,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/31_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "hgss3-32",
@@ -1739,8 +1739,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/32_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "hgss3-33",
@@ -1792,8 +1792,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/33_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "hgss3-34",
@@ -1838,8 +1838,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/34_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "hgss3-35",
@@ -1887,8 +1887,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/35_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "hgss3-36",
@@ -1927,8 +1927,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/36_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -1986,8 +1986,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 435,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/37_hires.png",
+    "nationalPokedexNumber": 435
   },
   {
     "id": "hgss3-38",
@@ -2038,8 +2038,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/38_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "hgss3-39",
@@ -2094,8 +2094,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/39_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -2141,8 +2141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/40_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "hgss3-41",
@@ -2193,8 +2193,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/41_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "hgss3-42",
@@ -2248,8 +2248,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/42_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2307,8 +2307,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/43_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2349,8 +2349,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/44_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -2407,8 +2407,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/45_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -2464,8 +2464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/46_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -2516,8 +2516,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/47_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2575,8 +2575,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/48_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2631,8 +2631,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/49_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -2684,8 +2684,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/50_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -2736,8 +2736,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/51_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "hgss3-52",
@@ -2787,8 +2787,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/52_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "hgss3-53",
@@ -2833,8 +2833,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/53_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -2881,8 +2881,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/54_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -2936,8 +2936,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/55_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -2995,8 +2995,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/56_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "hgss3-57",
@@ -3049,8 +3049,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/57_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -3097,8 +3097,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/58_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -3156,8 +3156,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/59_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -3207,8 +3207,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/60_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3239,7 +3239,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3255,8 +3255,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/61_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3298,8 +3298,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/62_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3351,8 +3351,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/63_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3393,8 +3393,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/64_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -3447,8 +3447,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/65_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -3500,8 +3500,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/66_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -3551,8 +3551,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/67_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -3606,8 +3606,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/68_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -3654,8 +3654,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/69_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -3696,8 +3696,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/70_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -3920,8 +3920,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/81_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "hgss3-82",
@@ -3973,8 +3973,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/82_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "hgss3-83",
@@ -4026,8 +4026,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/83_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "hgss3-84",
@@ -4079,8 +4079,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/84_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "hgss3-85",
@@ -4127,8 +4127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/85_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "hgss3-86",
@@ -4180,8 +4180,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/86_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "hgss3-87",
@@ -4203,8 +4203,8 @@
       "Water",
       "Fighting"
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/87_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "hgss3-88",
@@ -4267,8 +4267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/88_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "hgss3-89",
@@ -4290,8 +4290,8 @@
       "Colorless",
       "Psychic"
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/89_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "hgss3-90",
@@ -4347,8 +4347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss3/90_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "hgss3-THREE",
diff --git "a/json/cards/HS\342\200\224Unleashed.json" "b/json/cards/HS\342\200\224Unleashed.json"
index 0c336736f..5f7fb409c 100644
--- "a/json/cards/HS\342\200\224Unleashed.json"
+++ "b/json/cards/HS\342\200\224Unleashed.json"
@@ -40,8 +40,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/1_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "hgss2-2",
@@ -73,7 +73,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard the top 3 cards from your deck. This attack does 50 damage times the number of Energy cards you discarded."
       },
       {
@@ -95,8 +95,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/2_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "hgss2-3",
@@ -140,8 +140,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/3_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "hgss2-4",
@@ -200,8 +200,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/4_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "hgss2-5",
@@ -251,8 +251,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/5_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "hgss2-6",
@@ -303,8 +303,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/6_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "hgss2-7",
@@ -341,7 +341,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin for each Water Pokémon you have in play. This attack does 30 damage times the number of heads."
       }
     ],
@@ -351,8 +351,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/7_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "hgss2-8",
@@ -402,8 +402,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/8_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "hgss2-9",
@@ -432,7 +432,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Fighting Energy attached to Sudowoodo."
       },
       {
@@ -453,8 +453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/9_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "hgss2-10",
@@ -510,8 +510,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/10_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "hgss2-11",
@@ -540,7 +540,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to the Defending Pokémon."
       },
       {
@@ -567,8 +567,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/11_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "hgss2-12",
@@ -594,7 +594,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       },
       {
@@ -614,8 +614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/12_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "hgss2-13",
@@ -664,8 +664,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/13_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "hgss2-14",
@@ -702,7 +702,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 4 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -718,8 +718,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/14_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "hgss2-15",
@@ -760,7 +760,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 5 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -776,8 +776,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/15_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "hgss2-16",
@@ -819,8 +819,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/16_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "hgss2-17",
@@ -870,8 +870,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/17_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "hgss2-18",
@@ -922,8 +922,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/18_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "hgss2-19",
@@ -972,8 +972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/19_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "hgss2-20",
@@ -1022,8 +1022,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/20_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "hgss2-21",
@@ -1076,8 +1076,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/21_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "hgss2-22",
@@ -1127,8 +1127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/22_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "hgss2-23",
@@ -1173,8 +1173,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/23_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "hgss2-24",
@@ -1236,8 +1236,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/24_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "hgss2-25",
@@ -1282,8 +1282,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/25_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "hgss2-26",
@@ -1344,8 +1344,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/26_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "hgss2-27",
@@ -1397,8 +1397,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/27_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "hgss2-28",
@@ -1448,8 +1448,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/28_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "hgss2-29",
@@ -1487,8 +1487,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/29_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "hgss2-30",
@@ -1530,8 +1530,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/30_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1592,8 +1592,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 388,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/31_hires.png",
+    "nationalPokedexNumber": 388,
     "evolvesTo": [
       "Torterra"
     ]
@@ -1645,8 +1645,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/32_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -1701,8 +1701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/33_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -1758,8 +1758,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/34_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "hgss2-35",
@@ -1808,8 +1808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/35_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -1865,8 +1865,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/36_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "hgss2-37",
@@ -1915,8 +1915,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/37_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -1971,8 +1971,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/38_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2032,8 +2032,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/39_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2086,8 +2086,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/40_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2130,7 +2130,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads. Tauros is now Confused."
       }
     ],
@@ -2140,8 +2140,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/41_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "hgss2-42",
@@ -2191,8 +2191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/42_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2243,8 +2243,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/43_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -2286,8 +2286,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/44_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2328,8 +2328,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/45_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -2385,8 +2385,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/46_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "hgss2-47",
@@ -2430,8 +2430,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/47_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -2482,8 +2482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/48_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2534,8 +2534,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/49_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -2591,8 +2591,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/50_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -2649,8 +2649,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/51_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -2701,8 +2701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/52_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2753,8 +2753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/53_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -2801,8 +2801,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/54_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -2858,8 +2858,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/55_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -2911,8 +2911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/56_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -2957,8 +2957,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/57_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3009,8 +3009,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/58_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -3061,8 +3061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/59_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -3103,7 +3103,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3113,8 +3113,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/60_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -3155,8 +3155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/61_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -3212,8 +3212,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/62_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -3265,8 +3265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/63_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -3318,8 +3318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/64_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "hgss2-65",
@@ -3357,8 +3357,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/65_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -3415,8 +3415,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/66_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "hgss2-67",
@@ -3470,8 +3470,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/67_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -3512,8 +3512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/68_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3563,8 +3563,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/69_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -3620,8 +3620,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/70_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -3901,8 +3901,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/84_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "hgss2-85",
@@ -3946,8 +3946,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/85_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "hgss2-86",
@@ -3994,8 +3994,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/86_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "hgss2-87",
@@ -4062,8 +4062,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/87_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "hgss2-88",
@@ -4133,8 +4133,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/88_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "hgss2-89",
@@ -4194,8 +4194,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/89_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "hgss2-90",
@@ -4217,8 +4217,8 @@
       "Fire",
       "Lightning"
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/90_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "hgss2-91",
@@ -4272,8 +4272,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/91_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "hgss2-92",
@@ -4295,8 +4295,8 @@
       "Lightning",
       "Water"
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/92_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "hgss2-93",
@@ -4355,8 +4355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/93_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "hgss2-94",
@@ -4378,8 +4378,8 @@
       "Water",
       "Fire"
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/94_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "hgss2-95",
@@ -4438,8 +4438,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss2/95_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "hgss2-TWO",
diff --git a/json/cards/HeartGold & SoulSilver.json b/json/cards/HeartGold & SoulSilver.json
index 268696bee..e7b64abe5 100644
--- a/json/cards/HeartGold & SoulSilver.json	
+++ b/json/cards/HeartGold & SoulSilver.json	
@@ -50,8 +50,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/1_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "hgss1-2",
@@ -103,8 +103,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/2_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "hgss1-3",
@@ -154,8 +154,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/3_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "hgss1-4",
@@ -216,8 +216,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/4_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "hgss1-5",
@@ -245,7 +245,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -266,8 +266,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/5_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "hgss1-6",
@@ -293,7 +293,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play (both yours and your opponent's)."
       },
       {
@@ -318,8 +318,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/6_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "hgss1-7",
@@ -365,8 +365,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/7_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "hgss1-8",
@@ -418,8 +418,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/8_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "hgss1-9",
@@ -480,8 +480,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/9_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "hgss1-10",
@@ -507,7 +507,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -533,8 +533,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/10_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "hgss1-11",
@@ -573,8 +573,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/11_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "hgss1-12",
@@ -620,8 +620,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/12_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "hgss1-13",
@@ -651,7 +651,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin. If heads, this attack does 20 damage times the number of damage counters on Wobbuffet."
       }
     ],
@@ -661,8 +661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/13_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "hgss1-14",
@@ -718,8 +718,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/14_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "hgss1-15",
@@ -770,8 +770,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/15_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "hgss1-16",
@@ -824,8 +824,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/16_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "hgss1-17",
@@ -833,6 +833,11 @@
     "imageUrl": "https://images.pokemontcg.io/hgss1/17.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
+    "ability": {
+      "name": "Sweet Sleeping Face",
+      "text": "As long as Cleffa is Asleep, prevent all damage done to Cleffa by attacks.",
+      "type": "Poké-Body"
+    },
     "hp": "30",
     "number": "17",
     "artist": "Masakazu Fukuda",
@@ -854,8 +859,8 @@
         "text": "Shuffle your hand into your deck, then draw 6 cards. Cleffa is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 173,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/17_hires.png",
+    "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
     ]
@@ -897,7 +902,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip a coin for each Energy attached to Exeggutor. This attack does 40 damage times the number of heads."
       }
     ],
@@ -907,8 +912,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/18_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "hgss1-19",
@@ -961,8 +966,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/19_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "hgss1-20",
@@ -1016,8 +1021,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/20_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "hgss1-21",
@@ -1066,8 +1071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/21_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "hgss1-22",
@@ -1103,7 +1108,7 @@
         "text": "Granbull does 20 damage to itself. Switch Granbull with 1 of your Benched Pokémon."
       },
       {
-        "name": "Champ",
+        "name": "Chomp",
         "cost": [
           "Colorless",
           "Colorless",
@@ -1121,8 +1126,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/22_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "hgss1-23",
@@ -1169,8 +1174,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/23_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "hgss1-24",
@@ -1220,8 +1225,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/24_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "hgss1-25",
@@ -1273,8 +1278,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/25_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "hgss1-26",
@@ -1331,8 +1336,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/26_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "hgss1-27",
@@ -1381,8 +1386,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/27_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "hgss1-28",
@@ -1416,8 +1421,8 @@
         "text": "Each player may search his or her deck for as many Basic Pokémon as he or she likes, put them onto his or her Bench, and shuffle his or her deck afterward. (You put your Pokémon on the Bench first.) Pichu is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/28_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -1458,7 +1463,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1474,8 +1479,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/29_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "hgss1-30",
@@ -1504,8 +1509,8 @@
         "text": "Move an Energy card attached to 1 of your opponent's Pokémon to another of your opponent's Pokémon. Smoochum is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 238,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/30_hires.png",
+    "nationalPokedexNumber": 238,
     "evolvesTo": [
       "Jynx"
     ]
@@ -1560,8 +1565,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 192,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/31_hires.png",
+    "nationalPokedexNumber": 192
   },
   {
     "id": "hgss1-32",
@@ -1612,8 +1617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/32_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "hgss1-33",
@@ -1621,6 +1626,11 @@
     "imageUrl": "https://images.pokemontcg.io/hgss1/33.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
+    "ability": {
+      "name": "Sweet Sleeping Face",
+      "text": "As long as Tyrogue is Asleep, prevent all damage done to Tyrogue by attacks.",
+      "type": "Poké-Body"
+    },
     "hp": "30",
     "number": "33",
     "artist": "Ken Sugimori",
@@ -1642,8 +1652,8 @@
         "text": "This attack's damage isn't affected by Weakness or Resistance. Tyrogue is now Asleep."
       }
     ],
-    "nationalPokedexNumber": 236,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/33_hires.png",
+    "nationalPokedexNumber": 236,
     "evolvesTo": [
       "Hitmonlee",
       "Hitmonchan",
@@ -1698,8 +1708,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/34_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "hgss1-35",
@@ -1756,8 +1766,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/35_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -1812,8 +1822,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/36_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "hgss1-37",
@@ -1861,8 +1871,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/37_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "hgss1-38",
@@ -1914,8 +1924,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/38_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -1972,8 +1982,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/39_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "hgss1-40",
@@ -2018,7 +2028,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "70x",
+        "damage": "70×",
         "text": "Flip 2 coins. This attack does 70 damage times the number of heads."
       }
     ],
@@ -2034,8 +2044,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/40_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "hgss1-41",
@@ -2082,8 +2092,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/41_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "hgss1-42",
@@ -2139,8 +2149,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/42_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -2194,8 +2204,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/43_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "hgss1-44",
@@ -2224,8 +2234,8 @@
         "text": "Igglybuff is now Asleep. During your opponent's next turn, the attack cost of each of the Defending Pokémon's attacks is Colorless more."
       }
     ],
-    "nationalPokedexNumber": 174,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/44_hires.png",
+    "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
     ]
@@ -2282,8 +2292,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/45_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "hgss1-46",
@@ -2324,8 +2334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/46_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -2379,8 +2389,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/47_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "hgss1-48",
@@ -2431,8 +2441,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/48_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "hgss1-49",
@@ -2483,8 +2493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/49_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2526,8 +2536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 211,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/50_hires.png",
+    "nationalPokedexNumber": 211
   },
   {
     "id": "hgss1-51",
@@ -2569,8 +2579,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/51_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -2624,8 +2634,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/52_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "hgss1-53",
@@ -2651,7 +2661,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Choose as many Water Energy attached to your Pokémon as you like. This attack does 20 damage times the amount of Energy you chose. Shuffle those cards back into your deck."
       }
     ],
@@ -2661,8 +2671,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/53_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "hgss1-54",
@@ -2705,8 +2715,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/54_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "hgss1-55",
@@ -2749,8 +2759,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/55_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "hgss1-56",
@@ -2781,7 +2791,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       },
       {
@@ -2802,8 +2812,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/56_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "hgss1-57",
@@ -2841,8 +2851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/57_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -2896,8 +2906,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/58_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -2954,8 +2964,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/59_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -3005,8 +3015,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/60_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -3057,8 +3067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/61_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -3110,8 +3120,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/62_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -3142,7 +3152,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3152,8 +3162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/63_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -3204,8 +3214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/64_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "hgss1-65",
@@ -3255,8 +3265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/65_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3313,8 +3323,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/66_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -3361,8 +3371,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/67_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -3404,8 +3414,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/68_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3456,8 +3466,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/69_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "hgss1-70",
@@ -3505,8 +3515,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/70_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3547,7 +3557,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3563,8 +3573,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/71_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -3605,8 +3615,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/72_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3663,8 +3673,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/73_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3716,8 +3726,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/74_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -3768,8 +3778,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/75_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3820,8 +3830,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/76_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -3853,7 +3863,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Phanpy."
       }
     ],
@@ -3869,8 +3879,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/77_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3927,8 +3937,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/78_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3984,8 +3994,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/79_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -4035,8 +4045,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/80_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -4078,8 +4088,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/81_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -4132,8 +4142,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/82_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -4183,8 +4193,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/83_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -4225,8 +4235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/84_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4283,8 +4293,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 191,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/85_hires.png",
+    "nationalPokedexNumber": 191,
     "evolvesTo": [
       "Sunflora"
     ]
@@ -4335,8 +4345,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/86_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -4387,8 +4397,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/87_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -4444,8 +4454,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/88_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -4779,8 +4789,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/105_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "hgss1-106",
@@ -4827,8 +4837,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/106_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "hgss1-107",
@@ -4892,8 +4902,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/107_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "hgss1-108",
@@ -4942,8 +4952,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/108_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "hgss1-109",
@@ -4997,8 +5007,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/109_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "hgss1-110",
@@ -5045,8 +5055,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/110_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "hgss1-111",
@@ -5067,8 +5077,8 @@
     "types": [
       "Fire"
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/111_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "hgss1-112",
@@ -5123,8 +5133,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/112_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "hgss1-113",
@@ -5145,8 +5155,8 @@
     "types": [
       "Water"
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/113_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "hgss1-114",
@@ -5199,8 +5209,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/114_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "hgss1-115",
@@ -5371,8 +5381,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/123_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/hgss1/123_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "hgss1-ONE",
diff --git a/json/cards/Hidden Legends.json b/json/cards/Hidden Legends.json
index 5dc6fabad..0cae17ceb 100644
--- a/json/cards/Hidden Legends.json	
+++ b/json/cards/Hidden Legends.json	
@@ -52,8 +52,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/1_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "ex5-2",
@@ -87,7 +87,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of basic Energy cards attached to Claydol and the Defending Pokémon."
       }
     ],
@@ -97,8 +97,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/2_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex5-3",
@@ -144,8 +144,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/3_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ex5-4",
@@ -194,8 +194,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/4_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "ex5-5",
@@ -245,8 +245,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/5_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ex5-6",
@@ -319,8 +319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/6_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "ex5-7",
@@ -369,8 +369,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/7_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "ex5-8",
@@ -419,8 +419,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/8_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "ex5-9",
@@ -478,8 +478,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/9_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ex5-10",
@@ -530,8 +530,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/10_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "ex5-11",
@@ -569,7 +569,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 4 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -585,8 +585,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/11_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "ex5-12",
@@ -644,8 +644,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/12_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "ex5-13",
@@ -689,8 +689,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/13_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "ex5-14",
@@ -748,8 +748,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/14_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex5-15",
@@ -797,8 +797,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/15_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "ex5-16",
@@ -860,8 +860,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/16_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "ex5-17",
@@ -898,7 +898,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to the Defending Pokémon."
       }
     ],
@@ -908,8 +908,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 358,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/17_hires.png",
+    "nationalPokedexNumber": 358
   },
   {
     "id": "ex5-18",
@@ -955,8 +955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 368,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/18_hires.png",
+    "nationalPokedexNumber": 368
   },
   {
     "id": "ex5-19",
@@ -1007,8 +1007,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 367,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/19_hires.png",
+    "nationalPokedexNumber": 367
   },
   {
     "id": "ex5-20",
@@ -1060,8 +1060,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/20_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "ex5-21",
@@ -1117,8 +1117,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/21_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -1177,8 +1177,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/22_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ex5-23",
@@ -1231,8 +1231,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/23_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex5-24",
@@ -1275,8 +1275,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/24_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "ex5-25",
@@ -1332,8 +1332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/25_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex5-26",
@@ -1388,8 +1388,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/26_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex5-27",
@@ -1437,8 +1437,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/27_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "ex5-28",
@@ -1488,8 +1488,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/28_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -1543,8 +1543,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/29_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -1600,8 +1600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/30_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex5-31",
@@ -1652,8 +1652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/31_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex5-32",
@@ -1702,8 +1702,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/32_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "ex5-33",
@@ -1735,7 +1735,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Dodrio."
       },
       {
@@ -1761,8 +1761,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/33_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "ex5-34",
@@ -1808,8 +1808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/34_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "ex5-35",
@@ -1850,7 +1850,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -1860,8 +1860,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/35_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -1914,8 +1914,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/36_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1961,8 +1961,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 174,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/37_hires.png",
+    "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
     ]
@@ -1976,7 +1976,7 @@
     "evolvesFrom": "Chinchou",
     "ability": {
       "name": "Energy Grounding",
-      "text": "Once during your opponent's turn, when any of your Pokémon is Knocked Out by your opponent's attacks, you may use this power. Choose a basic Energy card discarded from the Knocked Out Pokémon and attach it to Lanturn. You can't use more than 1 Energy Grounding each turn.",
+      "text": "Once during your opponent's turn, when any of your Pokémon is Knocked Out by your opponent's attacks, you may use this power. Choose a basic Energy card discarded from the Knocked Out Pokémon and attach it to Lanturn. You can't use more than 1 Energy Grounding Poké-Power each turn.",
       "type": "Poké-Power"
     },
     "hp": "80",
@@ -2012,8 +2012,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/38_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ex5-39",
@@ -2065,8 +2065,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/39_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -2116,8 +2116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/40_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "ex5-41",
@@ -2162,8 +2162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/41_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2215,8 +2215,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/42_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "ex5-43",
@@ -2268,8 +2268,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/43_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -2324,8 +2324,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/44_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -2384,8 +2384,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/45_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -2444,8 +2444,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/46_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -2498,8 +2498,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/47_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -2539,7 +2539,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Spinda."
       }
     ],
@@ -2549,8 +2549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/48_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "ex5-49",
@@ -2600,8 +2600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/49_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ex5-50",
@@ -2652,8 +2652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 317,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/50_hires.png",
+    "nationalPokedexNumber": 317
   },
   {
     "id": "ex5-51",
@@ -2699,8 +2699,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/51_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "ex5-52",
@@ -2738,8 +2738,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/52_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -2789,8 +2789,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/53_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -2840,8 +2840,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/54_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2888,8 +2888,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/55_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -2940,8 +2940,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/56_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2992,8 +2992,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/57_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -3040,8 +3040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 366,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/58_hires.png",
+    "nationalPokedexNumber": 366,
     "evolvesTo": [
       "Huntail",
       "Gorebyss"
@@ -3093,8 +3093,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/59_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -3141,8 +3141,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/60_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -3192,8 +3192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/61_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -3243,8 +3243,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/62_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -3295,8 +3295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/63_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -3347,8 +3347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/64_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3379,7 +3379,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -3398,8 +3398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/65_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -3450,8 +3450,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/66_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -3508,8 +3508,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/67_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "ex5-68",
@@ -3556,8 +3556,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/68_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3614,8 +3614,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/69_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "ex5-70",
@@ -3643,7 +3643,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -3664,8 +3664,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/70_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3716,8 +3716,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/71_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3738,6 +3738,9 @@
     "series": "EX",
     "set": "Hidden Legends",
     "setCode": "ex5",
+    "types": [
+      "Psychic"
+    ],
     "attacks": [
       {
         "name": "Shadow Crush",
@@ -3761,11 +3764,8 @@
         "value": "-30"
       }
     ],
-    "types": [
-      "Psychic"
-    ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/72_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -3816,8 +3816,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/73_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -3859,8 +3859,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/74_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -3906,8 +3906,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/75_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -3948,8 +3948,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/76_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -3995,8 +3995,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/77_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -4037,8 +4037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/78_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -4069,7 +4069,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage for each damage counter on Totodile."
       },
       {
@@ -4089,8 +4089,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/79_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -4141,8 +4141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/80_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4192,8 +4192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/81_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -4234,8 +4234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/82_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -4266,7 +4266,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -4285,8 +4285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex5/83_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -4514,8 +4514,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/93_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "ex5-94",
@@ -4573,8 +4573,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/94_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "ex5-95",
@@ -4640,8 +4640,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/95_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "ex5-96",
@@ -4693,8 +4693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/96_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ex5-97",
@@ -4741,8 +4741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 378,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/97_hires.png",
+    "nationalPokedexNumber": 378
   },
   {
     "id": "ex5-98",
@@ -4790,8 +4790,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/98_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "ex5-99",
@@ -4844,8 +4844,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/99_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "ex5-100",
@@ -4893,8 +4893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/100_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "ex5-101",
@@ -4946,7 +4946,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex5/101_hires.png",
+    "nationalPokedexNumber": 40
   }
 ]
diff --git a/json/cards/Holon Phantoms.json b/json/cards/Holon Phantoms.json
index 34085ab56..6cd01a3d1 100644
--- a/json/cards/Holon Phantoms.json	
+++ b/json/cards/Holon Phantoms.json	
@@ -51,8 +51,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/1_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "ex13-2",
@@ -105,8 +105,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/2_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "ex13-3",
@@ -151,8 +151,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/3_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex13-4",
@@ -197,8 +197,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/4_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex13-5",
@@ -242,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/5_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex13-6",
@@ -286,8 +286,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/6_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "ex13-7",
@@ -345,8 +345,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/7_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "ex13-8",
@@ -406,8 +406,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/8_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ex13-9",
@@ -458,8 +458,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/9_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "ex13-10",
@@ -518,8 +518,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/10_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ex13-11",
@@ -583,8 +583,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/11_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "ex13-12",
@@ -648,8 +648,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/12_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "ex13-13",
@@ -701,8 +701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/13_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "ex13-14",
@@ -755,8 +755,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/14_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "ex13-15",
@@ -803,8 +803,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/15_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex13-16",
@@ -871,8 +871,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/16_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex13-17",
@@ -918,8 +918,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/17_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "ex13-18",
@@ -973,8 +973,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/18_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "ex13-19",
@@ -1025,8 +1025,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/19_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "ex13-20",
@@ -1077,8 +1077,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/20_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex13-21",
@@ -1138,8 +1138,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/21_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "ex13-22",
@@ -1200,8 +1200,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/22_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "ex13-23",
@@ -1255,8 +1255,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/23_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "ex13-24",
@@ -1305,8 +1305,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/24_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ex13-25",
@@ -1354,8 +1354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/25_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -1409,8 +1409,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/26_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "ex13-27",
@@ -1456,8 +1456,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 378,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/27_hires.png",
+    "nationalPokedexNumber": 378
   },
   {
     "id": "ex13-28",
@@ -1503,8 +1503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/28_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "ex13-29",
@@ -1556,8 +1556,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/29_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "ex13-30",
@@ -1601,8 +1601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/30_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "ex13-31",
@@ -1650,8 +1650,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/31_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "ex13-32",
@@ -1700,8 +1700,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/32_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "ex13-33",
@@ -1730,7 +1730,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to Torkoal."
       },
       {
@@ -1751,8 +1751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/33_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "ex13-34",
@@ -1800,8 +1800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/34_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "ex13-35",
@@ -1849,8 +1849,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/35_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "ex13-36",
@@ -1902,8 +1902,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/36_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex13-37",
@@ -1947,8 +1947,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 358,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/37_hires.png",
+    "nationalPokedexNumber": 358
   },
   {
     "id": "ex13-38",
@@ -1998,8 +1998,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/38_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex13-39",
@@ -2050,8 +2050,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/39_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -2094,7 +2094,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -2104,8 +2104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/40_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "ex13-41",
@@ -2156,8 +2156,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/41_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "ex13-42",
@@ -2206,8 +2206,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/42_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -2256,8 +2256,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/43_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "ex13-44",
@@ -2298,8 +2298,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/44_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "ex13-45",
@@ -2341,7 +2341,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2357,8 +2357,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/45_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2417,8 +2417,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/46_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex13-47",
@@ -2464,8 +2464,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/47_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "ex13-48",
@@ -2513,8 +2513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/48_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "ex13-49",
@@ -2560,8 +2560,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/49_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -2612,8 +2612,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/50_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "ex13-51",
@@ -2664,8 +2664,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/51_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex13-52",
@@ -2716,8 +2716,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/52_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2768,8 +2768,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/53_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "ex13-54",
@@ -2830,8 +2830,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/54_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -2884,8 +2884,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/55_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "ex13-56",
@@ -2924,7 +2924,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Wobbuffet."
       }
     ],
@@ -2934,8 +2934,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/56_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "ex13-57",
@@ -2985,8 +2985,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/57_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -3043,8 +3043,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/58_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -3085,7 +3085,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3095,8 +3095,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/59_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -3136,7 +3136,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Barboach."
       }
     ],
@@ -3146,8 +3146,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 339,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/60_hires.png",
+    "nationalPokedexNumber": 339,
     "evolvesTo": [
       "Whiscash"
     ]
@@ -3198,8 +3198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/61_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -3251,8 +3251,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/62_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -3283,7 +3283,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Corphish."
       },
       {
@@ -3302,8 +3302,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/63_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -3350,8 +3350,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/64_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3402,8 +3402,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/65_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -3454,8 +3454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/66_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -3508,8 +3508,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/67_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -3562,8 +3562,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/68_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -3604,8 +3604,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/69_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3656,8 +3656,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/70_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -3709,8 +3709,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/71_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3761,8 +3761,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/72_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3812,8 +3812,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/73_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3865,8 +3865,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/74_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3916,8 +3916,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/75_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3963,8 +3963,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/76_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -4011,8 +4011,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/77_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -4063,8 +4063,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/78_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4116,8 +4116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/79_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4174,8 +4174,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/80_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -4225,8 +4225,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/81_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -4267,8 +4267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/82_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -4319,8 +4319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/83_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -4371,8 +4371,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/84_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4668,7 +4668,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to Crawdaunt ex."
       }
     ],
@@ -4678,8 +4678,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/99_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "ex13-100",
@@ -4738,8 +4738,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/100_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "ex13-101",
@@ -4802,8 +4802,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/101_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex13-102",
@@ -4858,8 +4858,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/102_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ex13-103",
@@ -4911,8 +4911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/103_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ex13-104",
@@ -4963,8 +4963,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex13/104_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -5090,7 +5090,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex13/111_hires.png",
+    "nationalPokedexNumber": 151
   }
 ]
diff --git a/json/cards/Jungle.json b/json/cards/Jungle.json
index 50386450c..b9350f4eb 100644
--- a/json/cards/Jungle.json
+++ b/json/cards/Jungle.json
@@ -54,8 +54,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/1_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "base2-2",
@@ -107,8 +107,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/2_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "base2-3",
@@ -161,8 +161,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/3_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "base2-4",
@@ -214,8 +214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/4_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "base2-5",
@@ -274,8 +274,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/5_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "base2-6",
@@ -321,8 +321,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/6_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "base2-7",
@@ -377,8 +377,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/7_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "base2-8",
@@ -433,8 +433,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/8_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "base2-9",
@@ -486,8 +486,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/9_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "base2-10",
@@ -540,8 +540,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/10_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -601,8 +601,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/11_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "base2-12",
@@ -654,8 +654,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/12_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "base2-13",
@@ -704,8 +704,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/13_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "base2-14",
@@ -756,8 +756,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/14_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "base2-15",
@@ -805,8 +805,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/15_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "base2-16",
@@ -864,8 +864,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/16_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "base2-17",
@@ -922,8 +922,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/17_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "base2-18",
@@ -975,8 +975,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/18_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "base2-19",
@@ -1029,8 +1029,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/19_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "base2-20",
@@ -1082,8 +1082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/20_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "base2-21",
@@ -1142,8 +1142,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/21_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "base2-22",
@@ -1189,8 +1189,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/22_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "base2-23",
@@ -1245,8 +1245,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/23_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "base2-24",
@@ -1301,8 +1301,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/24_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "base2-25",
@@ -1354,8 +1354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/25_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "base2-26",
@@ -1408,8 +1408,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/26_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -1469,8 +1469,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/27_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "base2-28",
@@ -1522,8 +1522,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/28_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "base2-29",
@@ -1572,8 +1572,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/29_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "base2-30",
@@ -1624,8 +1624,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/30_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "base2-31",
@@ -1673,8 +1673,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/31_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "base2-32",
@@ -1732,8 +1732,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/32_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "base2-33",
@@ -1789,8 +1789,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/33_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "base2-34",
@@ -1840,8 +1840,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/34_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "base2-35",
@@ -1892,8 +1892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/35_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "base2-36",
@@ -1950,8 +1950,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/36_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "base2-37",
@@ -2001,8 +2001,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/37_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -2061,8 +2061,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/38_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -2123,8 +2123,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/39_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "base2-40",
@@ -2175,8 +2175,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/40_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2231,8 +2231,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/41_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "base2-42",
@@ -2287,8 +2287,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/42_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "base2-43",
@@ -2340,8 +2340,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/43_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "base2-44",
@@ -2390,8 +2390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/44_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "base2-45",
@@ -2453,8 +2453,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/45_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -2507,8 +2507,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/46_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "base2-47",
@@ -2566,8 +2566,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base2/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base2/47_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "base2-48",
@@ -2617,8 +2617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/48_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -2669,8 +2669,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/49_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -2728,8 +2728,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/50_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -2787,8 +2787,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/51_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2847,8 +2847,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/52_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -2887,8 +2887,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/53_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -2946,8 +2946,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/54_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -2991,8 +2991,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/55_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -3041,8 +3041,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/56_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3094,8 +3094,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/57_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -3147,8 +3147,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/58_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3201,8 +3201,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/59_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -3246,8 +3246,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/60_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3308,8 +3308,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/61_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3365,8 +3365,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/62_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -3418,8 +3418,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/base2/63_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
diff --git a/json/cards/Kalos Starter Set.json b/json/cards/Kalos Starter Set.json
index 2fb7f8be0..b4b1ed4c3 100644
--- a/json/cards/Kalos Starter Set.json	
+++ b/json/cards/Kalos Starter Set.json	
@@ -35,8 +35,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/1_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -87,8 +87,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/2_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -139,8 +139,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/3_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -195,8 +195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 651,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/4_hires.png",
+    "nationalPokedexNumber": 651,
     "evolvesTo": [
       "Chesnaught"
     ]
@@ -255,8 +255,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 652,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/5_hires.png",
+    "nationalPokedexNumber": 652
   },
   {
     "id": "xy0-6",
@@ -296,8 +296,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/6_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -348,8 +348,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/7_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -400,8 +400,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 653,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/8_hires.png",
+    "nationalPokedexNumber": 653,
     "evolvesTo": [
       "Braixen"
     ]
@@ -455,8 +455,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 654,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/9_hires.png",
+    "nationalPokedexNumber": 654,
     "evolvesTo": [
       "Delphox"
     ]
@@ -512,8 +512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 655,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/10_hires.png",
+    "nationalPokedexNumber": 655
   },
   {
     "id": "xy0-11",
@@ -561,8 +561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 515,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/11_hires.png",
+    "nationalPokedexNumber": 515,
     "evolvesTo": [
       "Simipour"
     ]
@@ -613,8 +613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 656,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/12_hires.png",
+    "nationalPokedexNumber": 656,
     "evolvesTo": [
       "Frogadier"
     ]
@@ -667,8 +667,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 657,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/13_hires.png",
+    "nationalPokedexNumber": 657,
     "evolvesTo": [
       "Greninja"
     ]
@@ -721,8 +721,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/14_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xy0-15",
@@ -761,8 +761,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 692,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/15_hires.png",
+    "nationalPokedexNumber": 692,
     "evolvesTo": [
       "Clawitzer"
     ]
@@ -810,8 +810,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/16_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -860,8 +860,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/17_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "xy0-18",
@@ -905,8 +905,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 686,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/18_hires.png",
+    "nationalPokedexNumber": 686,
     "evolvesTo": [
       "Malamar"
     ]
@@ -963,8 +963,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/19_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -1023,8 +1023,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/20_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "xy0-21",
@@ -1070,8 +1070,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 679,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/21_hires.png",
+    "nationalPokedexNumber": 679,
     "evolvesTo": [
       "Doublade"
     ]
@@ -1120,8 +1120,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/22_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -1183,8 +1183,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/23_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "xy0-24",
@@ -1228,8 +1228,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 684,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/24_hires.png",
+    "nationalPokedexNumber": 684,
     "evolvesTo": [
       "Slurpuff"
     ]
@@ -1276,8 +1276,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/25_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "xy0-26",
@@ -1332,8 +1332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/26_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "xy0-27",
@@ -1375,8 +1375,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/27_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "xy0-28",
@@ -1415,8 +1415,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/28_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -1460,8 +1460,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/29_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -1503,8 +1503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 659,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/30_hires.png",
+    "nationalPokedexNumber": 659,
     "evolvesTo": [
       "Diggersby"
     ]
@@ -1551,8 +1551,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy0/31_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -1605,8 +1605,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 676,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/32_hires.png",
+    "nationalPokedexNumber": 676
   },
   {
     "id": "xy0-33",
@@ -1656,8 +1656,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 676,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy0/33_hires.png",
+    "nationalPokedexNumber": 676
   },
   {
     "id": "xy0-34",
diff --git a/json/cards/Legend Maker.json b/json/cards/Legend Maker.json
index 707786937..f38dc2bb7 100644
--- a/json/cards/Legend Maker.json	
+++ b/json/cards/Legend Maker.json	
@@ -55,8 +55,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/1_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "ex12-2",
@@ -118,8 +118,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/2_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "ex12-3",
@@ -181,8 +181,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/3_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "ex12-4",
@@ -237,8 +237,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/4_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "ex12-5",
@@ -299,8 +299,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/5_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "ex12-6",
@@ -363,8 +363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/6_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "ex12-7",
@@ -420,8 +420,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/7_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "ex12-8",
@@ -466,8 +466,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/8_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "ex12-9",
@@ -519,8 +519,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/9_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ex12-10",
@@ -564,8 +564,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/10_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "ex12-11",
@@ -622,8 +622,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/11_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "ex12-12",
@@ -685,8 +685,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/12_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex12-13",
@@ -743,8 +743,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/13_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "ex12-14",
@@ -805,8 +805,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/14_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "ex12-15",
@@ -865,8 +865,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/15_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "ex12-16",
@@ -919,8 +919,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/16_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "ex12-17",
@@ -962,8 +962,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 368,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/17_hires.png",
+    "nationalPokedexNumber": 368
   },
   {
     "id": "ex12-18",
@@ -1009,8 +1009,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 367,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/18_hires.png",
+    "nationalPokedexNumber": 367
   },
   {
     "id": "ex12-19",
@@ -1067,8 +1067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/19_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ex12-20",
@@ -1120,8 +1120,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/20_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "ex12-21",
@@ -1175,8 +1175,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/21_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -1242,8 +1242,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/22_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1301,8 +1301,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/23_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "ex12-24",
@@ -1355,8 +1355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/24_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "ex12-25",
@@ -1408,8 +1408,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/25_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "ex12-26",
@@ -1462,8 +1462,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/26_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "ex12-27",
@@ -1512,8 +1512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/27_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "ex12-28",
@@ -1547,7 +1547,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to Wobbuffet."
       },
       {
@@ -1568,8 +1568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/28_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "ex12-29",
@@ -1618,8 +1618,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/29_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -1668,8 +1668,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 268,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/30_hires.png",
+    "nationalPokedexNumber": 268,
     "evolvesTo": [
       "Dustox"
     ]
@@ -1724,8 +1724,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/31_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "ex12-32",
@@ -1773,8 +1773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/32_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ex12-33",
@@ -1825,8 +1825,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/33_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "ex12-34",
@@ -1872,8 +1872,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/34_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -1932,8 +1932,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/35_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1982,8 +1982,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/36_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -2039,8 +2039,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 352,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/37_hires.png",
+    "nationalPokedexNumber": 352
   },
   {
     "id": "ex12-38",
@@ -2097,8 +2097,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/38_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2156,8 +2156,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/39_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2218,8 +2218,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/40_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -2277,8 +2277,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/41_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -2324,8 +2324,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/42_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -2373,8 +2373,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/43_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -2437,8 +2437,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/44_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -2482,7 +2482,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2492,8 +2492,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/45_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "ex12-46",
@@ -2542,8 +2542,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/46_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -2597,8 +2597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/47_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -2656,8 +2656,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/48_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2698,8 +2698,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/49_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -2750,8 +2750,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/50_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2801,8 +2801,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 366,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/51_hires.png",
+    "nationalPokedexNumber": 366,
     "evolvesTo": [
       "Huntail",
       "Gorebyss"
@@ -2859,8 +2859,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/52_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -2902,8 +2902,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/53_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -2954,8 +2954,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/54_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -3006,8 +3006,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/55_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3060,8 +3060,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/56_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -3102,8 +3102,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/57_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3149,8 +3149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/58_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -3197,8 +3197,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/59_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3255,8 +3255,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/60_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3296,7 +3296,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3306,8 +3306,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/61_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3358,8 +3358,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/62_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -3416,8 +3416,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/63_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -3468,8 +3468,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/64_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -3511,8 +3511,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/65_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -3553,8 +3553,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/66_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -3595,7 +3595,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3605,8 +3605,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/67_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -3657,8 +3657,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/68_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -3713,8 +3713,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/69_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -3760,8 +3760,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/70_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -3808,8 +3808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 360,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/71_hires.png",
+    "nationalPokedexNumber": 360,
     "evolvesTo": [
       "Wobbuffet"
     ]
@@ -4075,8 +4075,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/83_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ex12-84",
@@ -4127,8 +4127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/84_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "ex12-85",
@@ -4183,8 +4183,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/85_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "ex12-86",
@@ -4227,8 +4227,8 @@
         "text": "During your next turn, if an attack does damage to the Defending Pokémon (after applying Weakness and Resistance), that attack does 30 more damage."
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/86_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "ex12-87",
@@ -4278,8 +4278,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/87_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "ex12-88",
@@ -4327,8 +4327,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/88_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "ex12-89",
@@ -4373,8 +4373,8 @@
         "text": "Choose 1 of your opponent's Pokémon. This attack does 40 damage to that Pokémon. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/89_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "ex12-90",
@@ -4428,8 +4428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 378,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/90_hires.png",
+    "nationalPokedexNumber": 378
   },
   {
     "id": "ex12-91",
@@ -4483,8 +4483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/91_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "ex12-92",
@@ -4544,8 +4544,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex12/92_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "ex12-93",
@@ -4583,7 +4583,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4593,8 +4593,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex12/93_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
diff --git a/json/cards/Legendary Collection.json b/json/cards/Legendary Collection.json
index 0d8267599..213b35ce6 100644
--- a/json/cards/Legendary Collection.json	
+++ b/json/cards/Legendary Collection.json	
@@ -9,8 +9,8 @@
     "evolvesFrom": "Kadabra",
     "ability": {
       "name": "Damage Swap",
-      "text": "As often as you like during your turn (before your attack), you may move 1 damage counter from one of your Pokémon to another as long as you don't K-O that Pokémon. This power can't be used if Alakazam is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "text": "As often as you like during your turn (before your attack), you may move 1 damage counter from 1 of your Pokémon to another as long as you don't Knock Out that Pokémon. This power can't be used if Alakazam is Asleep, Confused, or Paralyzed.",
+      "type": "Pokémon Power"
     },
     "hp": "80",
     "retreatCost": [
@@ -46,8 +46,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/1_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "base6-2",
@@ -101,8 +101,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/2_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "base6-3",
@@ -143,7 +143,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "100",
-        "text": "Discard 2 Energy cards attached or this attack does nothing."
+        "text": "Discard 2 Energy cards attached to Charizard in order to use this attack."
       }
     ],
     "weaknesses": [
@@ -158,8 +158,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/3_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "base6-4",
@@ -212,8 +212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/4_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "base6-5",
@@ -226,7 +226,7 @@
     "ability": {
       "name": "Summon Minions",
       "text": "When you play Dark Dragonite from your hand, search your deck for up to 2 Basic Pokémon and put them onto your Bench. Shuffle your deck afterward.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "70",
     "retreatCost": [
@@ -262,8 +262,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/5_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "base6-6",
@@ -316,8 +316,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/6_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "base6-7",
@@ -359,8 +359,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/7_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "base6-8",
@@ -373,7 +373,7 @@
     "ability": {
       "name": "Reel In",
       "text": "When you play Dark Slowbro from your hand, choose up to 3 Basic Pokémon and/or Evolution cards from your discard pile and put them into your hand.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "60",
     "retreatCost": [
@@ -407,8 +407,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/8_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "base6-9",
@@ -461,8 +461,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/9_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "base6-10",
@@ -515,8 +515,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/10_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "base6-11",
@@ -529,7 +529,7 @@
     "ability": {
       "name": "Curse",
       "text": "Once during your turn (before your attack), you may move 1 damage counter from 1 of your opponent's Pokémon to another (even if it would Knock Out the other Pokémon). This power can't be used if Gengar is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "80",
     "retreatCost": [
@@ -563,8 +563,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/11_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "base6-12",
@@ -611,7 +611,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "40",
-        "text": "Flip a coin. If heads, defender is now Paralyzed."
+        "text": "Flip a coin. If heads, Defending Pokémon is now Paralyzed."
       }
     ],
     "weaknesses": [
@@ -626,8 +626,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/12_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "base6-13",
@@ -678,8 +678,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/13_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "base6-14",
@@ -731,8 +731,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/14_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "base6-15",
@@ -744,8 +744,8 @@
     "evolvesFrom": "Machoke",
     "ability": {
       "name": "Strikes Back",
-      "text": "Whenever opponent damages Machamp (even if it knocks out Machamp), this power does 10 damage to attacker (no weakness or resistance.) This power cannot be used if Machamp is already Asleep, Confused, or Paralyzed when opponent attacks.",
-      "type": "Poké-Power"
+      "text": "Whenever your opponent's attack damages Machamp (even if Machamp is Knoced Out), this power does 10 damage to attacking Pokémon. (Don't apply Weakness and Resistance.) This power can't be used if Machamp is already Asleep, Confused, or Paralyzed when your opponent attacks.",
+      "type": "Pokémon Power"
     },
     "hp": "100",
     "retreatCost": [
@@ -782,8 +782,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/15_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "base6-16",
@@ -796,7 +796,7 @@
     "ability": {
       "name": "Toxic Gas",
       "text": "Ignore all Pokémon Powers other than Toxic Gases. This power stops working while Muk is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "70",
     "retreatCost": [
@@ -831,8 +831,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/16_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "base6-17",
@@ -864,7 +864,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "If your opponent has any Benched Pokémon, choose 1 and switch it with his or her Active Pokémon."
+        "text": "If your opponent has any Benched Pokémon, choose 1 of them and switch it with the Defending Pokémon."
       },
       {
         "name": "Fire Blast",
@@ -876,7 +876,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "80",
-        "text": "Discard 1 Energy card to use this attack."
+        "text": "Discard 1 Energy card attached to Ninetales in order to use this attack."
       }
     ],
     "weaknesses": [
@@ -885,8 +885,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/17_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "base6-18",
@@ -898,8 +898,8 @@
     "evolvesFrom": "Ivysaur",
     "ability": {
       "name": "Energy Trans",
-      "text": "As often as you like during your turn (before attack), you may take 1 Grass Energy card attached to 1 of your Pokémon and attach it to a different one. This power can't be used if Venusaur is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "text": "As often as you like during your turn (before your attack), you may take 1 Grass Energy card attached to 1 of your Pokémon and attach it to a different one. This power can't be used if Venusaur is Asleep, Confused, or Paralyzed.",
+      "type": "Pokémon Power"
     },
     "hp": "100",
     "retreatCost": [
@@ -935,8 +935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/18_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "base6-19",
@@ -971,7 +971,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "60",
-        "text": "Flip a coin. If tails, Zapdos does 30 damage to self."
+        "text": "Flip a coin. If tails, Zapdos does 30 damage to itself."
       },
       {
         "name": "Thunderbolt",
@@ -983,7 +983,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "100",
-        "text": "Discard all Energy cards to use this attack."
+        "text": "Discard all Energy cards attached to Zapdos in order to use this attack."
       }
     ],
     "resistances": [
@@ -992,8 +992,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/19_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "base6-20",
@@ -1023,7 +1023,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30×",
-        "text": "(30x) Flip 2 coins. This attack does 30 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
         "name": "Poison Sting",
@@ -1049,8 +1049,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/20_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "base6-21",
@@ -1106,8 +1106,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/21_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "base6-22",
@@ -1159,8 +1159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/22_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "base6-23",
@@ -1202,7 +1202,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "20×",
-        "text": "(20x) Flip a number of coins equal to the number of Energy attached to Exeggutor. This attack does 20 damage times the number of heads."
+        "text": "Flip a number of coins equal to the number of Energy attached to Exeggutor. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -1211,8 +1211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/23_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "base6-24",
@@ -1270,8 +1270,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/24_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "base6-25",
@@ -1323,8 +1323,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/25_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "base6-26",
@@ -1355,7 +1355,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "Flip 2 coins. Attack does 10 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
         "name": "Meditate",
@@ -1366,7 +1366,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20+",
-        "text": "Does 20 damage plus 10 more damage for each damage counter on defender."
+        "text": "Does 20 damage plus 10 more damage for each damage counter on the Defending Pokémon."
       }
     ],
     "weaknesses": [
@@ -1375,8 +1375,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/26_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "base6-27",
@@ -1429,8 +1429,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/27_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "base6-28",
@@ -1484,8 +1484,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/28_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1538,8 +1538,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/29_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "base6-30",
@@ -1591,8 +1591,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/30_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "base6-31",
@@ -1627,7 +1627,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage; If tails, this attack does 30 damage plus Nidoking does 10 damage to self."
+        "text": "Flip a coin. If heads, this attack does 30 damage plus 10 more damage; if tails, this attack does 30 damage and Nidoking does 10 damage to itself."
       },
       {
         "name": "Toxic",
@@ -1638,7 +1638,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40",
-        "text": "Defender is now Poisoned. It now takes 20 Poison damage instead of 10 after each player's turn (even if it was already Poisoned)."
+        "text": "The Defending Pokémon is now Poisoned. It now takes 20 Poison damage instead of 10 after each player's turn (even if it was already Poisoned)."
       }
     ],
     "weaknesses": [
@@ -1647,8 +1647,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/31_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "base6-32",
@@ -1703,8 +1703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/32_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "base6-33",
@@ -1759,8 +1759,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/33_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "base6-34",
@@ -1792,7 +1792,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20",
-        "text": "If your opponent has any Benched Pokémon, he or she chooses 1 of them and switches the Defending Pokémon with it. (Do the damage before switching the Pokémon."
+        "text": "If your opponent has any Benched Pokémon, he or she chooses 1 of them and switches it with the Defending Pokémon. (Do the damage before switching the Pokémon.)"
       },
       {
         "name": "Mirror Move",
@@ -1803,7 +1803,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "",
-        "text": "If Pidgeotto was attacked last turn, do the final result of that attack on Pidgeotto to the defending Pokémon."
+        "text": "If Pidgeotto was attacked last turn, do the final result of that attack on Pidgeotto to the Defending Pokémon."
       }
     ],
     "weaknesses": [
@@ -1818,8 +1818,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/34_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -1884,8 +1884,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/35_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -1923,7 +1923,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "50",
-        "text": "Discard 1 Energy card to use this attack."
+        "text": "Discard 1 Energy card attached to Arcanine in order to use this attack."
       },
       {
         "name": "Take Down",
@@ -1935,7 +1935,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "80",
-        "text": "Arcanine does 30 damage to self."
+        "text": "Arcanine does 30 damage to itself."
       }
     ],
     "weaknesses": [
@@ -1944,8 +1944,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/36_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "base6-37",
@@ -1989,7 +1989,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "50",
-        "text": "Discard 1 Energy card to use this attack."
+        "text": "Discard 1 Energy card attached to Charmeleon in order to use this attack."
       }
     ],
     "weaknesses": [
@@ -1998,8 +1998,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/37_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -2015,7 +2015,7 @@
     "ability": {
       "name": "Evolutionary Light",
       "text": "Once during your turn (before your attack), you may search your deck for an Evolution card. Show it to your opponent and put it into your hand. Shuffle your deck afterward. This power can't be used if Dark Dragonair is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "60",
     "retreatCost": [
@@ -2041,7 +2041,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 20 more damage; if tails, this attack does 20 damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 20 more damage; if tails, this attack does 20 damage."
       }
     ],
     "resistances": [
@@ -2050,8 +2050,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/38_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -2104,8 +2104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/39_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2155,7 +2155,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "30",
-        "text": "Flip a coin. If heads, defender is now Paralyzed."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       }
     ],
     "weaknesses": [
@@ -2164,8 +2164,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/40_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "base6-41",
@@ -2177,8 +2177,8 @@
     "evolvesFrom": "Doduo",
     "ability": {
       "name": "Retreat Aid",
-      "text": "As long as Dodrio is Benched, pay 1 Energy less to retreat your Active Pokémon.",
-      "type": "Poké-Power"
+      "text": "As long as Dodrio is Benched, pay 1 Colorless less to retreat your Active Pokémon.",
+      "type": "Pokémon Power"
     },
     "hp": "70",
     "number": "41",
@@ -2200,7 +2200,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "10+",
-        "text": "(10+) Does 10 damage plus 10 more damage for each damage counter on Dodrio."
+        "text": "Does 10 damage plus 10 more damage for each damage counter on Dodrio."
       }
     ],
     "weaknesses": [
@@ -2215,8 +2215,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/41_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "base6-42",
@@ -2273,8 +2273,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/42_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "base6-43",
@@ -2325,8 +2325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/43_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "base6-44",
@@ -2379,8 +2379,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/44_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -2423,8 +2423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/45_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -2440,7 +2440,7 @@
     "ability": {
       "name": "Transparency",
       "text": "Whenever an attack does anything to Haunter, flip a coin. If heads, prevent all effects of that attack, including damage, done to Haunter. This power stops working while Haunter is Asleep.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "50",
     "number": "46",
@@ -2470,8 +2470,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/46_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2518,7 +2518,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30",
-        "text": "Defender is now Poisoned."
+        "text": "The Defending Pokémon is now Poisoned."
       }
     ],
     "weaknesses": [
@@ -2527,8 +2527,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/47_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -2543,7 +2543,7 @@
     "ability": {
       "name": "Kabuto Armor",
       "text": "Whenever an attack (even your own) does damage to Kabuto (after applying Weakness and Resistance), that attack only does half the damage to Kabuto (rounded down to nearest 10). (Any other effects of attacks still happen.) This power stops working while Kabuto is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "30",
     "retreatCost": [
@@ -2575,8 +2575,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/48_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -2613,7 +2613,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Discard 1 Energy card to use this attack. Remove all damage counters from Kadabra."
+        "text": "Discard 1 Energy card attached to Kadabra in order use this attack. Remove all damage counters from Kadabra."
       },
       {
         "name": "Super Psy",
@@ -2633,8 +2633,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/49_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -2670,7 +2670,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Flip a coin. If heads, prevent all damage done to Kakuna during opponent's next turn. (any other effects of attacks still happen.)"
+        "text": "Flip a coin. If heads, prevent all damage done to Kakuna during your opponent's next turn. (Any other effects of attacks still happen.)"
       },
       {
         "name": "Poisonpowder",
@@ -2680,7 +2680,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Flip a coin. If heads, defender is now Poisoned."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Poisoned."
       }
     ],
     "weaknesses": [
@@ -2689,8 +2689,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/50_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -2728,7 +2728,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "",
-        "text": "(50-) Does 50 damage minus 10 for each damage counter on Machoke."
+        "text": "Does 50 damage minus 10 for each damage counter on Machoke."
       },
       {
         "name": "Submission",
@@ -2740,7 +2740,7 @@
         ],
         "convertedEnergyCost": 4,
         "damage": "60",
-        "text": "Does 20 damage to self."
+        "text": "Machoke does 20 damage to itself."
       }
     ],
     "weaknesses": [
@@ -2749,8 +2749,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/51_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2801,8 +2801,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/52_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -2851,8 +2851,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/53_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -2888,7 +2888,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Flip a coin. If heads, prevent all damage done to Metapod on opponent's next turn. (any other effects of attacks still happen.)"
+        "text": "Flip a coin. If heads, prevent all damage done to Metapod during your opponent's next turn. (Any other effects of attacks still happen.)"
       },
       {
         "name": "Stun Spore",
@@ -2898,7 +2898,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20",
-        "text": "Flip a coin. If heads, defender is now Paralyzed."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       }
     ],
     "weaknesses": [
@@ -2907,8 +2907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/54_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -2953,7 +2953,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30×",
-        "text": "(30x) Flip 2 coins. This attack does 30 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -2962,8 +2962,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/55_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2999,7 +2999,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30×",
-        "text": "Flip 2 coins. Does 30 damage times number of heads."
+        "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
         "name": "Horn Drill",
@@ -3020,8 +3020,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/56_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -3036,7 +3036,7 @@
     "ability": {
       "name": "Clairvoyance",
       "text": "Your opponent plays with his or her hand face up. This power stops working while Omanyte is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "40",
     "retreatCost": [
@@ -3068,8 +3068,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/57_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3123,8 +3123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/58_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "base6-59",
@@ -3156,7 +3156,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 3 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
         "name": "Tantrum",
@@ -3176,8 +3176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/59_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "base6-60",
@@ -3206,7 +3206,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 10 more damage; if tails, this attack does 20 damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 10 more damage; if tails, this attack does 20 damage."
       },
       {
         "name": "Agility",
@@ -3226,8 +3226,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/60_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "base6-61",
@@ -3269,7 +3269,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "",
-        "text": "(?) Does damage to defender equal to half the defender's remaining HP (rounded up to the nearest 10)."
+        "text": "Does damage to the Defending Pokémon equal to half the Defending Pokémon's remaining HP (rounded up to the nearest 10)."
       }
     ],
     "weaknesses": [
@@ -3284,8 +3284,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/61_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "base6-62",
@@ -3327,7 +3327,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 3 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -3342,8 +3342,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/62_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "base6-63",
@@ -3395,8 +3395,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/63_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -3411,7 +3411,7 @@
     "ability": {
       "name": "Thick Skinned",
       "text": "Snorlax can't become Asleep, Confused, Paralyzed, or Poisoned. This power can't be used if Snorlax is already Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "90",
     "retreatCost": [
@@ -3455,8 +3455,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/64_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "base6-65",
@@ -3466,6 +3466,10 @@
     "supertype": "Pokémon",
     "level": "24",
     "hp": "60",
+    "retreatCost": [
+      "Colorless",
+      "Colorless"
+    ],
     "number": "65",
     "artist": "Kagemaru Himeno",
     "rarity": "Uncommon",
@@ -3510,8 +3514,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/65_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "base6-66",
@@ -3558,8 +3562,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base6/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base6/66_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "base6-67",
@@ -3586,7 +3590,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Flip a coin. If heads, defender is now Paralyzed."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       }
     ],
     "weaknesses": [
@@ -3595,8 +3599,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/67_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -3639,8 +3643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/68_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -3673,7 +3677,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Flip a coin. If heads, the defender is now Paralyzed."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       }
     ],
     "weaknesses": [
@@ -3682,8 +3686,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/69_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -3726,7 +3730,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30",
-        "text": "Discard 1 Energy card to use this attack."
+        "text": "Discard 1 Energy card attached to Charmander in order to use this attack."
       }
     ],
     "weaknesses": [
@@ -3735,8 +3739,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/70_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -3781,8 +3785,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/71_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -3824,8 +3828,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/72_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -3840,9 +3844,12 @@
     "ability": {
       "name": "Long Distance Hypnosis",
       "text": "Once during your turn (before your attack) you may flip a coin. If heads defender is now Asleep; if tails, your active Pokémon is now Asleep. The power can't be used if Drowzee is affected by a Special Condition.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "50",
+    "retreatCost": [
+      "Colorless"
+    ],
     "number": "73",
     "artist": "Ken Sugimori",
     "rarity": "Common",
@@ -3861,7 +3868,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "10",
-        "text": "Defender is now Asleep."
+        "text": "The Defending Pokémon is now Asleep."
       }
     ],
     "weaknesses": [
@@ -3870,8 +3877,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/73_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -3929,8 +3936,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/74_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3989,8 +3996,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/75_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -4020,7 +4027,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Flip a coin. If heads, defender is now Asleep."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       },
       {
         "name": "Energy Conversion",
@@ -4030,7 +4037,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Put upto 2 Energy from your discard pile into your hand. Gastly does 10 damage to itself."
+        "text": "Put up to 2 Energy cards from your discard pile into your hand. Gastly does 10 damage to itself."
       }
     ],
     "resistances": [
@@ -4039,8 +4046,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/76_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -4074,7 +4081,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "10×",
-        "text": "(10x) Flip a coin until you get tails. This attack does 10 damage times the number of heads."
+        "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -4083,8 +4090,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/77_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -4135,8 +4142,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/78_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -4190,8 +4197,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/79_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -4224,7 +4231,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Flip a coin. If heads, defender is now Paralyzed."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       },
       {
         "name": "Selfdestruct",
@@ -4243,8 +4250,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/80_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -4284,7 +4291,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "(20+) Flip a coin. If heads, this attack does 20 damage plus 20 more; if tails, this attack does 20 damage."
+        "text": "Flip a coin. If heads, this attack does 20 damage plus 20 more; if tails, this attack does 20 damage."
       }
     ],
     "weaknesses": [
@@ -4293,8 +4300,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/81_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -4327,7 +4334,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) Flip 3 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       },
       {
         "name": "Call for Family",
@@ -4346,8 +4353,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/82_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -4389,8 +4396,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/83_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -4435,7 +4442,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "During opponent's next turn, prevent 30 or less damage (after applying weakness and resistance). (any other effects of attacks still happen.)"
+        "text": "During opponent's next turn, whenever 30 or less damage is done to Onix (after applying Weakness and Resistance), prevent that damage. (Any other effects of attacks still happen.)"
       }
     ],
     "weaknesses": [
@@ -4444,8 +4451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/84_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -4494,8 +4501,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/85_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -4538,8 +4545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/86_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4592,8 +4599,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/87_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -4636,7 +4643,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20+",
-        "text": "Does 20 damage plus 10 more for each Energy attaches to Psyduck but not used to pay for this attack's energy cost. You can add more then 20 damage this way."
+        "text": "Does 20 damage plus 10 more damage for each Energy attached to Psyduck but not used to pay for this attack. You can't add more than 20 damage in this way."
       }
     ],
     "weaknesses": [
@@ -4645,8 +4652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/88_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -4691,8 +4698,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/89_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4753,8 +4760,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/90_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -4802,8 +4809,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/91_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -4845,8 +4852,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/92_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -4898,8 +4905,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/93_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -4956,8 +4963,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/94_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4990,7 +4997,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Flip a coin. If heads, defender is now Paralyzed."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       },
       {
         "name": "Withdraw",
@@ -5000,7 +5007,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Flip a coin. If heads, prevent all damage done to Squirtle during opponent's next turn. (Any other effects of attacks still happen.)"
+        "text": "Flip a coin. If heads, prevent all damage done to Squirtle during your opponent's next turn. (Any other effects of attacks still happen.)"
       }
     ],
     "weaknesses": [
@@ -5009,8 +5016,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/95_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -5025,7 +5032,7 @@
     "ability": {
       "name": "Cowardice",
       "text": "At any time during your turn (before your attack), you may return Tentacool to your hand. (Discard all cards attached to Tentacool.) This power can't be used the turn you put Tentacool into play or if Tentacool is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
+      "type": "Pokémon Power"
     },
     "hp": "30",
     "number": "96",
@@ -5054,8 +5061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/96_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -5097,8 +5104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/97_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -5132,7 +5139,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "10",
-        "text": "Flip a coin. If heads, defender is now Confused."
+        "text": "Flip a coin. If heads, the Defending Pokémon is now Confused."
       }
     ],
     "weaknesses": [
@@ -5141,8 +5148,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/98_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -5174,8 +5181,8 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "",
-        "text": "Flip a coin. If heads, defender is now Poisoned."
+        "damage": "10",
+        "text": "Flip a coin. If heads, Defending Pokémon is now Poisoned."
       }
     ],
     "weaknesses": [
@@ -5184,8 +5191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/base6/99_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
diff --git a/json/cards/Legendary Treasures.json b/json/cards/Legendary Treasures.json
index 3d520a8a0..3aec66ddb 100644
--- a/json/cards/Legendary Treasures.json	
+++ b/json/cards/Legendary Treasures.json	
@@ -53,8 +53,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/1_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -117,8 +117,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/2_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "bw11-3",
@@ -157,7 +157,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -167,8 +167,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/3_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "bw11-4",
@@ -196,7 +196,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -212,8 +212,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/4_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -262,8 +262,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/5_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "bw11-6",
@@ -308,8 +308,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/6_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -358,8 +358,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 496,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/7_hires.png",
+    "nationalPokedexNumber": 496,
     "evolvesTo": [
       "Serperior"
     ]
@@ -413,8 +413,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/8_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bw11-9",
@@ -443,7 +443,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -453,8 +453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/9_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -496,8 +496,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/10_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -549,8 +549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 541,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/11_hires.png",
+    "nationalPokedexNumber": 541,
     "evolvesTo": [
       "Leavanny"
     ]
@@ -600,8 +600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 542,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/12_hires.png",
+    "nationalPokedexNumber": 542
   },
   {
     "id": "bw11-13",
@@ -641,8 +641,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 557,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/13_hires.png",
+    "nationalPokedexNumber": 557,
     "evolvesTo": [
       "Crustle"
     ]
@@ -697,8 +697,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 558,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/14_hires.png",
+    "nationalPokedexNumber": 558
   },
   {
     "id": "bw11-15",
@@ -752,8 +752,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/15_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw11-16",
@@ -803,8 +803,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/16_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "bw11-17",
@@ -853,8 +853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/17_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -908,8 +908,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/18_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -968,8 +968,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/19_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "bw11-20",
@@ -1008,8 +1008,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/20_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -1053,8 +1053,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/21_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "bw11-22",
@@ -1113,8 +1113,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/22_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "bw11-23",
@@ -1158,8 +1158,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/23_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw11-24",
@@ -1211,8 +1211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/24_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw11-25",
@@ -1252,8 +1252,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 498,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/25_hires.png",
+    "nationalPokedexNumber": 498,
     "evolvesTo": [
       "Pignite"
     ]
@@ -1309,8 +1309,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 499,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/26_hires.png",
+    "nationalPokedexNumber": 499,
     "evolvesTo": [
       "Emboar"
     ]
@@ -1363,8 +1363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/27_hires.png",
+    "nationalPokedexNumber": 500
   },
   {
     "id": "bw11-28",
@@ -1415,8 +1415,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/28_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw11-29",
@@ -1473,8 +1473,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/29_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw11-30",
@@ -1512,8 +1512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/30_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -1548,7 +1548,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Prize cards both players have taken."
       },
       {
@@ -1571,8 +1571,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/31_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "bw11-32",
@@ -1631,8 +1631,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/32_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "bw11-33",
@@ -1671,8 +1671,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/33_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -1716,8 +1716,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 394,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/34_hires.png",
+    "nationalPokedexNumber": 394,
     "evolvesTo": [
       "Empoleon"
     ]
@@ -1772,8 +1772,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/35_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "bw11-36",
@@ -1820,8 +1820,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 489,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/36_hires.png",
+    "nationalPokedexNumber": 489
   },
   {
     "id": "bw11-37",
@@ -1860,8 +1860,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/37_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -1904,8 +1904,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 502,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/38_hires.png",
+    "nationalPokedexNumber": 502,
     "evolvesTo": [
       "Samurott"
     ]
@@ -1955,8 +1955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 503,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/39_hires.png",
+    "nationalPokedexNumber": 503
   },
   {
     "id": "bw11-40",
@@ -2004,8 +2004,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 535,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/40_hires.png",
+    "nationalPokedexNumber": 535,
     "evolvesTo": [
       "Palpitoad"
     ]
@@ -2049,7 +2049,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of your Pokémon that have the Round attack."
       }
     ],
@@ -2059,8 +2059,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 536,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/41_hires.png",
+    "nationalPokedexNumber": 536,
     "evolvesTo": [
       "Seismitoad"
     ]
@@ -2095,7 +2095,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of your Pokémon that have the Round attack."
       },
       {
@@ -2116,8 +2116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/42_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "bw11-43",
@@ -2168,8 +2168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/43_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw11-44",
@@ -2226,8 +2226,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/44_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw11-45",
@@ -2276,8 +2276,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/45_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "bw11-46",
@@ -2320,7 +2320,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 4 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -2336,8 +2336,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/46_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "bw11-47",
@@ -2384,8 +2384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/47_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "bw11-48",
@@ -2432,8 +2432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/48_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "bw11-49",
@@ -2483,8 +2483,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/49_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "bw11-50",
@@ -2533,8 +2533,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/50_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bw11-51",
@@ -2585,8 +2585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/51_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw11-52",
@@ -2643,8 +2643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/52_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw11-53",
@@ -2696,8 +2696,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/53_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "bw11-54",
@@ -2730,7 +2730,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to this Pokémon and the Defending Pokémon."
       },
       {
@@ -2751,8 +2751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/54_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -2792,8 +2792,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/55_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -2846,8 +2846,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/56_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "bw11-57",
@@ -2886,8 +2886,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/57_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -2941,8 +2941,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/58_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "bw11-59",
@@ -2981,8 +2981,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/59_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3036,8 +3036,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/60_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -3074,8 +3074,8 @@
         "text": "Flip a coin. If heads, the Defending Pokémon is now Paralyzed."
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/61_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "bw11-62",
@@ -3114,8 +3114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/62_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -3168,8 +3168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/63_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "bw11-64",
@@ -3197,7 +3197,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3213,8 +3213,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 527,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/64_hires.png",
+    "nationalPokedexNumber": 527,
     "evolvesTo": [
       "Swoobat"
     ]
@@ -3271,8 +3271,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 528,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/65_hires.png",
+    "nationalPokedexNumber": 528
   },
   {
     "id": "bw11-66",
@@ -3317,8 +3317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/66_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "bw11-67",
@@ -3369,8 +3369,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/67_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -3421,8 +3421,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/68_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "bw11-69",
@@ -3460,7 +3460,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3470,8 +3470,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/69_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -3513,8 +3513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 574,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/70_hires.png",
+    "nationalPokedexNumber": 574,
     "evolvesTo": [
       "Gothorita"
     ]
@@ -3546,7 +3546,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -3566,8 +3566,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 575,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/71_hires.png",
+    "nationalPokedexNumber": 575,
     "evolvesTo": [
       "Gothitelle"
     ]
@@ -3617,8 +3617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 576,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/72_hires.png",
+    "nationalPokedexNumber": 576
   },
   {
     "id": "bw11-73",
@@ -3656,8 +3656,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 577,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/73_hires.png",
+    "nationalPokedexNumber": 577,
     "evolvesTo": [
       "Duosion"
     ]
@@ -3708,8 +3708,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 577,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/74_hires.png",
+    "nationalPokedexNumber": 577,
     "evolvesTo": [
       "Duosion"
     ]
@@ -3751,8 +3751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 578,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/75_hires.png",
+    "nationalPokedexNumber": 578,
     "evolvesTo": [
       "Reuniclus"
     ]
@@ -3794,7 +3794,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Does 40 damage times the number of Reuniclus you have in play."
       }
     ],
@@ -3804,8 +3804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/76_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "bw11-77",
@@ -3858,8 +3858,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 609,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/77_hires.png",
+    "nationalPokedexNumber": 609
   },
   {
     "id": "bw11-78",
@@ -3908,8 +3908,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/78_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "bw11-79",
@@ -3957,8 +3957,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/79_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -4006,8 +4006,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/80_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "bw11-81",
@@ -4058,8 +4058,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/81_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "bw11-82",
@@ -4121,8 +4121,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/82_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "bw11-83",
@@ -4178,8 +4178,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 618,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/83_hires.png",
+    "nationalPokedexNumber": 618
   },
   {
     "id": "bw11-84",
@@ -4232,8 +4232,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/84_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw11-85",
@@ -4288,8 +4288,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/85_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "bw11-86",
@@ -4338,8 +4338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/86_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "bw11-87",
@@ -4376,8 +4376,8 @@
         "text": "Shuffle your hand into your deck. Then, draw a number of cards equal to the number of cards in your opponent's hand."
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/87_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "bw11-88",
@@ -4432,8 +4432,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/88_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "bw11-89",
@@ -4487,8 +4487,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/89_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -4522,7 +4522,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Darkness Pokémon you have in play."
       },
       {
@@ -4532,7 +4532,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of damage counters on this Pokémon."
       }
     ],
@@ -4548,8 +4548,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/90_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "bw11-91",
@@ -4606,8 +4606,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/91_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bw11-92",
@@ -4658,8 +4658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/92_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "bw11-93",
@@ -4710,8 +4710,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/93_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "bw11-94",
@@ -4759,8 +4759,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/94_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -4812,8 +4812,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/95_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -4865,8 +4865,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/96_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "bw11-97",
@@ -4915,8 +4915,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/97_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -4971,8 +4971,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/98_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -5024,8 +5024,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/99_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "bw11-100",
@@ -5082,8 +5082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/100_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw11-101",
@@ -5140,8 +5140,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/101_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw11-102",
@@ -5197,8 +5197,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/102_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "bw11-103",
@@ -5243,8 +5243,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/103_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -5295,8 +5295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/104_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -5345,8 +5345,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/105_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "bw11-106",
@@ -5386,8 +5386,8 @@
         "text": "The Defending Pokémon can't retreat during your opponent's next turn."
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/106_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "bw11-107",
@@ -5439,8 +5439,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 626,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/107_hires.png",
+    "nationalPokedexNumber": 626
   },
   {
     "id": "bw11-108",
@@ -5495,8 +5495,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/108_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bw11-109",
@@ -5632,8 +5632,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/114_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw11-115",
@@ -5684,8 +5684,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/115_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw11-RC1",
@@ -5734,8 +5734,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 495,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC1_hires.png",
+    "nationalPokedexNumber": 495,
     "evolvesTo": [
       "Servine"
     ]
@@ -5788,8 +5788,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 496,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC2_hires.png",
+    "nationalPokedexNumber": 496,
     "evolvesTo": [
       "Serperior"
     ]
@@ -5839,8 +5839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 497,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC3_hires.png",
+    "nationalPokedexNumber": 497
   },
   {
     "id": "bw11-RC4",
@@ -5891,8 +5891,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC4_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -5943,8 +5943,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC5_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -5995,8 +5995,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC6_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -6047,8 +6047,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC7_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -6099,8 +6099,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC8_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -6142,7 +6142,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -6152,8 +6152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC9_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -6207,8 +6207,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC10_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "bw11-RC11",
@@ -6251,7 +6251,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of your Pokémon that have the Round attack."
       }
     ],
@@ -6261,8 +6261,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC11_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "bw11-RC12",
@@ -6319,8 +6319,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 618,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC12_hires.png",
+    "nationalPokedexNumber": 618
   },
   {
     "id": "bw11-RC13",
@@ -6364,8 +6364,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC13_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -6406,8 +6406,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC14_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -6467,8 +6467,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC15_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -6515,7 +6515,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 3 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -6525,8 +6525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC16_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "bw11-RC17",
@@ -6557,7 +6557,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -6567,8 +6567,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC17_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "bw11-RC18",
@@ -6596,7 +6596,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -6606,8 +6606,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC18_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -6656,8 +6656,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC19_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "bw11-RC20",
@@ -6731,8 +6731,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC21_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "bw11-RC22",
@@ -6783,8 +6783,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC22_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw11-RC23",
@@ -6834,8 +6834,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC23_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "bw11-RC24",
@@ -6872,7 +6872,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Move as many Energy attached to your Pokémon to your other Pokémon in any way you like"
+        "text": "Move as many Energy attached to your Pokémon to your other Pokémon in any way you like."
       }
     ],
     "weaknesses": [
@@ -6881,8 +6881,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC24_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "bw11-RC25",
@@ -6925,7 +6925,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of your Pokémon that have the Round attack."
       }
     ],
@@ -6935,7 +6935,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw11/RC25_hires.png",
+    "nationalPokedexNumber": 648
   }
 ]
diff --git a/json/cards/Legends Awakened.json b/json/cards/Legends Awakened.json
index dc117cb0c..7df265468 100644
--- a/json/cards/Legends Awakened.json	
+++ b/json/cards/Legends Awakened.json	
@@ -42,8 +42,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/1_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "dp6-2",
@@ -105,8 +105,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/2_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "dp6-3",
@@ -156,8 +156,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 478,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/3_hires.png",
+    "nationalPokedexNumber": 478
   },
   {
     "id": "dp6-4",
@@ -217,8 +217,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/4_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "dp6-5",
@@ -274,8 +274,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/5_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "dp6-6",
@@ -325,8 +325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/6_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "dp6-7",
@@ -356,7 +356,7 @@
           "Free"
         ],
         "convertedEnergyCost": 0,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Search your discard pile for as many Water Energy cards as you like, show them to your opponent, and this attack does 10 damage for each Water Energy card you chose. Put those cards on top of your deck. Shuffle your deck afterward."
       },
       {
@@ -375,8 +375,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/7_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "dp6-8",
@@ -436,8 +436,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/8_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "dp6-9",
@@ -500,8 +500,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 473,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/9_hires.png",
+    "nationalPokedexNumber": 473
   },
   {
     "id": "dp6-10",
@@ -556,8 +556,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/10_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "dp6-11",
@@ -608,8 +608,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/11_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "dp6-12",
@@ -655,8 +655,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/12_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "dp6-13",
@@ -705,8 +705,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/13_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "dp6-14",
@@ -761,8 +761,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/14_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "dp6-15",
@@ -812,8 +812,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/15_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "dp6-16",
@@ -858,8 +858,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/16_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "dp6-17",
@@ -914,8 +914,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/17_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "dp6-18",
@@ -963,8 +963,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/18_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "dp6-19",
@@ -1008,8 +1008,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 482,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/19_hires.png",
+    "nationalPokedexNumber": 482
   },
   {
     "id": "dp6-20",
@@ -1065,8 +1065,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/20_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "dp6-21",
@@ -1119,8 +1119,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/21_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "dp6-22",
@@ -1179,8 +1179,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/22_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "dp6-23",
@@ -1225,8 +1225,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/23_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "dp6-24",
@@ -1273,8 +1273,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/24_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "dp6-25",
@@ -1321,8 +1321,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/25_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "dp6-26",
@@ -1364,8 +1364,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/26_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "dp6-27",
@@ -1398,8 +1398,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/27_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "dp6-28",
@@ -1454,8 +1454,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/28_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "dp6-29",
@@ -1513,8 +1513,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/29_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "dp6-30",
@@ -1562,8 +1562,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/30_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "dp6-31",
@@ -1618,8 +1618,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/31_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "dp6-32",
@@ -1671,8 +1671,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/32_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "dp6-33",
@@ -1727,8 +1727,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/33_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "dp6-34",
@@ -1773,8 +1773,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 481,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/34_hires.png",
+    "nationalPokedexNumber": 481
   },
   {
     "id": "dp6-35",
@@ -1826,8 +1826,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/35_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "dp6-36",
@@ -1875,8 +1875,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 378,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/36_hires.png",
+    "nationalPokedexNumber": 378
   },
   {
     "id": "dp6-37",
@@ -1925,8 +1925,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/37_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "dp6-38",
@@ -1974,8 +1974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/38_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "dp6-39",
@@ -2030,8 +2030,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 379,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/39_hires.png",
+    "nationalPokedexNumber": 379
   },
   {
     "id": "dp6-40",
@@ -2067,8 +2067,8 @@
         "text": "Put 3 damage counters on the Defending Pokémon. If Shedinja has any damage counters on it, the Defending Pokémon is now Confused."
       }
     ],
-    "nationalPokedexNumber": 292,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/40_hires.png",
+    "nationalPokedexNumber": 292
   },
   {
     "id": "dp6-41",
@@ -2114,8 +2114,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/41_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "dp6-42",
@@ -2159,8 +2159,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/42_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-43",
@@ -2204,8 +2204,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 480,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/43_hires.png",
+    "nationalPokedexNumber": 480
   },
   {
     "id": "dp6-44",
@@ -2258,8 +2258,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 71,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/44_hires.png",
+    "nationalPokedexNumber": 71
   },
   {
     "id": "dp6-45",
@@ -2307,8 +2307,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/45_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "dp6-46",
@@ -2358,8 +2358,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/46_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -2416,8 +2416,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/47_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "dp6-48",
@@ -2462,8 +2462,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/48_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "dp6-49",
@@ -2508,8 +2508,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/49_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "dp6-50",
@@ -2554,8 +2554,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/50_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "dp6-51",
@@ -2600,8 +2600,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 351,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/51_hires.png",
+    "nationalPokedexNumber": 351
   },
   {
     "id": "dp6-52",
@@ -2653,8 +2653,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/52_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -2711,8 +2711,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/53_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "dp6-54",
@@ -2751,7 +2751,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard as many Energy cards as you like attached to your Pokémon. For each Energy card you discarded, flip a coin. This attack does 50 damage times the number of heads."
       }
     ],
@@ -2761,8 +2761,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/54_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "dp6-55",
@@ -2818,8 +2818,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/55_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "dp6-56",
@@ -2860,7 +2860,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to Grumpig."
       }
     ],
@@ -2870,8 +2870,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/56_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "dp6-57",
@@ -2926,8 +2926,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/57_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "dp6-58",
@@ -2978,8 +2978,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/58_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "dp6-59",
@@ -3031,8 +3031,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/59_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "dp6-60",
@@ -3062,7 +3062,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -3088,8 +3088,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/60_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "dp6-61",
@@ -3140,8 +3140,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/61_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "dp6-62",
@@ -3199,8 +3199,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/62_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -3244,7 +3244,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 2,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip a coin until you get tails. This attack does 50 damage times the number of heads."
       }
     ],
@@ -3260,8 +3260,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/63_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "dp6-64",
@@ -3320,8 +3320,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/64_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -3383,8 +3383,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/65_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -3427,7 +3427,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon you have in play."
       }
     ],
@@ -3443,8 +3443,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/66_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "dp6-67",
@@ -3492,8 +3492,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/67_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -3544,8 +3544,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/68_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "dp6-69",
@@ -3606,8 +3606,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/69_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -3661,8 +3661,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/70_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -3711,8 +3711,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/71_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "dp6-72",
@@ -3765,8 +3765,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 317,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/72_hires.png",
+    "nationalPokedexNumber": 317
   },
   {
     "id": "dp6-73",
@@ -3818,8 +3818,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/73_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "dp6-74",
@@ -3850,7 +3850,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin for each Tauros you have in play. This attack does 20 damage times the number of heads."
       },
       {
@@ -3871,8 +3871,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/74_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "dp6-75",
@@ -3923,8 +3923,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/75_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "dp6-76",
@@ -3968,8 +3968,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/76_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-77",
@@ -4013,8 +4013,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/77_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-78",
@@ -4058,8 +4058,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/78_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-79",
@@ -4103,8 +4103,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/79_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-80",
@@ -4152,8 +4152,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/80_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-81",
@@ -4198,8 +4198,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/81_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-82",
@@ -4243,8 +4243,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/82_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp6-83",
@@ -4296,8 +4296,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/83_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -4355,8 +4355,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/84_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -4407,8 +4407,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 69,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/85_hires.png",
+    "nationalPokedexNumber": 69,
     "evolvesTo": [
       "Weepinbell"
     ]
@@ -4450,7 +4450,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4460,8 +4460,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/86_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -4513,8 +4513,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/87_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -4566,8 +4566,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/88_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -4619,8 +4619,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/89_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -4662,7 +4662,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4678,8 +4678,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/90_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -4721,7 +4721,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4731,8 +4731,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/91_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -4790,8 +4790,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/92_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -4842,8 +4842,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/93_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -4900,8 +4900,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/94_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -4959,8 +4959,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/95_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -5013,8 +5013,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/96_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -5069,8 +5069,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/97_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -5123,8 +5123,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/98_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -5176,8 +5176,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/99_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "dp6-100",
@@ -5228,8 +5228,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/100_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "dp6-101",
@@ -5259,7 +5259,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -5280,8 +5280,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/101_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "dp6-102",
@@ -5329,8 +5329,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/102_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -5387,8 +5387,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/103_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -5446,8 +5446,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/104_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -5501,8 +5501,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/105_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -5544,7 +5544,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -5554,8 +5554,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/106_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -5612,8 +5612,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/107_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -5664,8 +5664,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/108_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -5717,8 +5717,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/109_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -5772,8 +5772,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/110_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -5824,8 +5824,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/111_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -5877,8 +5877,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/112_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -5930,8 +5930,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/113_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -5982,8 +5982,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/114_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -6038,8 +6038,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/115_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -6098,8 +6098,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/116_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -6151,8 +6151,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/117_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -6194,7 +6194,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -6210,8 +6210,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/118_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -6262,8 +6262,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/119_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -6321,8 +6321,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/120_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -6374,8 +6374,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/121_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -6427,8 +6427,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/122_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -6487,8 +6487,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/123_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -6545,8 +6545,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/124_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -6597,8 +6597,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/125_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -6645,8 +6645,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 236,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/126_hires.png",
+    "nationalPokedexNumber": 236,
     "evolvesTo": [
       "Hitmonlee",
       "Hitmonchan",
@@ -6702,8 +6702,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 70,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/127_hires.png",
+    "nationalPokedexNumber": 70,
     "evolvesTo": [
       "Victreebel"
     ]
@@ -6761,8 +6761,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp6/128_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -7013,8 +7013,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 482,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/140_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/140_hires.png",
+    "nationalPokedexNumber": 482
   },
   {
     "id": "dp6-141",
@@ -7065,8 +7065,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/141_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/141_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "dp6-142",
@@ -7123,8 +7123,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/142_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/142_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "dp6-143",
@@ -7176,8 +7176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 481,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/143_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/143_hires.png",
+    "nationalPokedexNumber": 481
   },
   {
     "id": "dp6-144",
@@ -7227,8 +7227,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/144_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/144_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "dp6-145",
@@ -7263,7 +7263,7 @@
           "Free"
         ],
         "convertedEnergyCost": 0,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard the top 5 cards from your deck. This attack does 50 damage for each Energy card you discarded."
       },
       {
@@ -7290,8 +7290,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/145_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "dp6-146",
@@ -7339,7 +7339,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 480,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp6/146_hires.png",
+    "nationalPokedexNumber": 480
   }
 ]
diff --git a/json/cards/Majestic Dawn.json b/json/cards/Majestic Dawn.json
index 2b36cfa65..60a767294 100644
--- a/json/cards/Majestic Dawn.json	
+++ b/json/cards/Majestic Dawn.json	
@@ -50,8 +50,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/1_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "dp5-2",
@@ -101,8 +101,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 488,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/2_hires.png",
+    "nationalPokedexNumber": 488
   },
   {
     "id": "dp5-3",
@@ -164,8 +164,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/3_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "dp5-4",
@@ -227,8 +227,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/4_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "dp5-5",
@@ -279,8 +279,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/5_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "dp5-6",
@@ -328,8 +328,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/6_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "dp5-7",
@@ -387,8 +387,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/7_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "dp5-8",
@@ -442,8 +442,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/8_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "dp5-9",
@@ -503,8 +503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/9_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "dp5-10",
@@ -557,8 +557,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/10_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "dp5-11",
@@ -614,8 +614,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/11_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "dp5-12",
@@ -664,8 +664,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 489,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/12_hires.png",
+    "nationalPokedexNumber": 489
   },
   {
     "id": "dp5-13",
@@ -720,8 +720,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/13_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "dp5-14",
@@ -774,8 +774,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/14_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "dp5-15",
@@ -827,8 +827,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/15_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "dp5-16",
@@ -892,8 +892,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/16_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "dp5-17",
@@ -946,8 +946,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/17_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "dp5-18",
@@ -994,8 +994,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/18_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "dp5-19",
@@ -1047,8 +1047,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/19_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "dp5-20",
@@ -1100,8 +1100,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/20_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "dp5-21",
@@ -1154,8 +1154,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/21_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "dp5-22",
@@ -1191,7 +1191,7 @@
           "Fire"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Discard all Fire Energy attached to Infernape. This attack does 40 damage times the amount of Fire Energy you discarded."
       }
     ],
@@ -1201,8 +1201,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/22_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "dp5-23",
@@ -1256,8 +1256,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/23_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "dp5-24",
@@ -1315,8 +1315,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/24_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "dp5-25",
@@ -1371,8 +1371,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/25_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "dp5-26",
@@ -1418,8 +1418,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/26_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "dp5-27",
@@ -1468,8 +1468,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 489,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/27_hires.png",
+    "nationalPokedexNumber": 489
   },
   {
     "id": "dp5-28",
@@ -1524,8 +1524,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/28_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "dp5-29",
@@ -1582,8 +1582,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/29_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "dp5-30",
@@ -1639,8 +1639,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/30_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "dp5-31",
@@ -1691,8 +1691,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/31_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "dp5-32",
@@ -1745,8 +1745,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/32_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "dp5-33",
@@ -1790,8 +1790,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/33_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp5-34",
@@ -1842,8 +1842,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/34_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "dp5-35",
@@ -1895,8 +1895,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 424,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/35_hires.png",
+    "nationalPokedexNumber": 424
   },
   {
     "id": "dp5-36",
@@ -1923,7 +1923,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -1950,8 +1950,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/36_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "dp5-37",
@@ -2010,8 +2010,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 388,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/37_hires.png",
+    "nationalPokedexNumber": 388,
     "evolvesTo": [
       "Torterra"
     ]
@@ -2057,7 +2057,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2067,8 +2067,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/38_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "dp5-39",
@@ -2108,7 +2108,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2118,8 +2118,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/39_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -2175,8 +2175,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/40_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "dp5-41",
@@ -2223,8 +2223,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 391,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/41_hires.png",
+    "nationalPokedexNumber": 391,
     "evolvesTo": [
       "Infernape"
     ]
@@ -2259,7 +2259,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of different types of Wormadam on your Bench."
       },
       {
@@ -2285,8 +2285,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 414,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/42_hires.png",
+    "nationalPokedexNumber": 414,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2344,8 +2344,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/43_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "dp5-44",
@@ -2397,8 +2397,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 394,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/44_hires.png",
+    "nationalPokedexNumber": 394,
     "evolvesTo": [
       "Empoleon"
     ]
@@ -2455,8 +2455,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/45_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "dp5-46",
@@ -2511,8 +2511,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/46_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -2569,8 +2569,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/47_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -2603,7 +2603,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Sudowoodo."
       },
       {
@@ -2623,8 +2623,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/48_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "dp5-49",
@@ -2665,8 +2665,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/49_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp5-50",
@@ -2715,8 +2715,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/50_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -2768,8 +2768,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/51_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -2826,8 +2826,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/52_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -2878,8 +2878,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/53_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -2931,8 +2931,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/54_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -2987,8 +2987,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/55_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "dp5-56",
@@ -3037,8 +3037,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/56_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -3073,7 +3073,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3083,8 +3083,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/57_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -3131,8 +3131,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 433,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/58_hires.png",
+    "nationalPokedexNumber": 433,
     "evolvesTo": [
       "Chimecho"
     ]
@@ -3190,8 +3190,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/59_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -3242,8 +3242,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/60_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -3300,8 +3300,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/61_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -3352,8 +3352,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/62_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3411,8 +3411,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/63_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3477,8 +3477,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/64_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3530,8 +3530,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 431,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/65_hires.png",
+    "nationalPokedexNumber": 431,
     "evolvesTo": [
       "Purugly"
     ]
@@ -3585,8 +3585,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/66_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -3634,8 +3634,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/67_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -3684,8 +3684,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 446,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/68_hires.png",
+    "nationalPokedexNumber": 446,
     "evolvesTo": [
       "Snorlax"
     ]
@@ -3734,8 +3734,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/69_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3794,8 +3794,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/70_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3847,8 +3847,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/71_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -3893,8 +3893,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/72_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -3947,8 +3947,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 422,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/73_hires.png",
+    "nationalPokedexNumber": 422,
     "evolvesTo": [
       "Gastrodon"
     ]
@@ -4006,8 +4006,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/74_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4065,8 +4065,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/75_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -4124,8 +4124,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/76_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -4184,8 +4184,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/77_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -4238,8 +4238,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp5/78_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -4610,8 +4610,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/97_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "dp5-98",
@@ -4660,8 +4660,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/98_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "dp5-99",
@@ -4716,8 +4716,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/99_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "dp5-100",
@@ -4754,7 +4754,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp5/100_hires.png",
+    "nationalPokedexNumber": 474
   }
 ]
diff --git a/json/cards/Mysterious Treasures.json b/json/cards/Mysterious Treasures.json
index 4ef648cf0..161c9cbb5 100644
--- a/json/cards/Mysterious Treasures.json	
+++ b/json/cards/Mysterious Treasures.json	
@@ -59,8 +59,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/1_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "dp2-2",
@@ -107,8 +107,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/2_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "dp2-3",
@@ -159,8 +159,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 424,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/3_hires.png",
+    "nationalPokedexNumber": 424
   },
   {
     "id": "dp2-4",
@@ -204,8 +204,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 482,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/4_hires.png",
+    "nationalPokedexNumber": 482
   },
   {
     "id": "dp2-5",
@@ -252,8 +252,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/5_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "dp2-6",
@@ -308,8 +308,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/6_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "dp2-7",
@@ -358,8 +358,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/7_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "dp2-8",
@@ -391,7 +391,7 @@
           "Water"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Choose as many Energy cards from your hand as you like and show them to your opponent. This attack does 20 damage times the number of Energy cards you chose. Put those Energy cards on top of your deck. Shuffle your deck afterward."
       },
       {
@@ -412,8 +412,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/8_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "dp2-9",
@@ -457,8 +457,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/9_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "dp2-10",
@@ -511,8 +511,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/10_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "dp2-11",
@@ -558,8 +558,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 457,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/11_hires.png",
+    "nationalPokedexNumber": 457
   },
   {
     "id": "dp2-12",
@@ -613,8 +613,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/12_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "dp2-13",
@@ -672,8 +672,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/13_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "dp2-14",
@@ -718,8 +718,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 481,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/14_hires.png",
+    "nationalPokedexNumber": 481
   },
   {
     "id": "dp2-15",
@@ -759,7 +759,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard all basic Lightning Energy cards attached to Raichu. This attack does 30 damage times the number of Lightning Energy cards you discarded."
       }
     ],
@@ -775,8 +775,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/15_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "dp2-16",
@@ -824,8 +824,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/16_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "dp2-17",
@@ -887,8 +887,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/17_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "dp2-18",
@@ -932,8 +932,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 480,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/18_hires.png",
+    "nationalPokedexNumber": 480
   },
   {
     "id": "dp2-19",
@@ -982,8 +982,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 460,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/19_hires.png",
+    "nationalPokedexNumber": 460
   },
   {
     "id": "dp2-20",
@@ -1029,8 +1029,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/20_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "dp2-21",
@@ -1085,8 +1085,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 411,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/21_hires.png",
+    "nationalPokedexNumber": 411
   },
   {
     "id": "dp2-22",
@@ -1134,8 +1134,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 358,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/22_hires.png",
+    "nationalPokedexNumber": 358
   },
   {
     "id": "dp2-23",
@@ -1184,8 +1184,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/23_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "dp2-24",
@@ -1216,7 +1216,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin for each basic Energy card attached to Exeggutor and to the Defending Pokémon. This attack does 30 damage times the number of heads."
       },
       {
@@ -1235,8 +1235,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/24_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "dp2-25",
@@ -1284,8 +1284,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/25_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "dp2-26",
@@ -1341,8 +1341,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/26_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "dp2-27",
@@ -1394,8 +1394,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 402,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/27_hires.png",
+    "nationalPokedexNumber": 402
   },
   {
     "id": "dp2-28",
@@ -1422,7 +1422,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of basic Energy cards attached to Manectric."
       },
       {
@@ -1449,8 +1449,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/28_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "dp2-29",
@@ -1501,8 +1501,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/29_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "dp2-30",
@@ -1547,8 +1547,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/30_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "dp2-31",
@@ -1602,8 +1602,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/31_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "dp2-32",
@@ -1649,8 +1649,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/32_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "dp2-33",
@@ -1702,8 +1702,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 409,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/33_hires.png",
+    "nationalPokedexNumber": 409
   },
   {
     "id": "dp2-34",
@@ -1754,8 +1754,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/34_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "dp2-35",
@@ -1804,8 +1804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/35_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "dp2-36",
@@ -1851,8 +1851,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/36_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "dp2-37",
@@ -1896,8 +1896,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/37_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp2-38",
@@ -1951,8 +1951,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/38_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "dp2-39",
@@ -2001,8 +2001,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/39_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "dp2-40",
@@ -2036,7 +2036,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of damage counters on Whiscash."
       },
       {
@@ -2064,8 +2064,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/40_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "dp2-41",
@@ -2105,7 +2105,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2121,8 +2121,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/41_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -2169,8 +2169,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 433,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/42_hires.png",
+    "nationalPokedexNumber": 433,
     "evolvesTo": [
       "Chimecho"
     ]
@@ -2223,8 +2223,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 408,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/43_hires.png",
+    "nationalPokedexNumber": 408,
     "evolvesTo": [
       "Rampardos"
     ]
@@ -2274,8 +2274,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/44_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -2326,8 +2326,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/45_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "dp2-46",
@@ -2354,7 +2354,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -2381,8 +2381,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/46_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "dp2-47",
@@ -2430,8 +2430,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/47_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "dp2-48",
@@ -2481,8 +2481,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/48_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -2534,8 +2534,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/49_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "dp2-50",
@@ -2578,8 +2578,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/50_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -2615,7 +2615,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -2642,8 +2642,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/51_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -2690,8 +2690,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 440,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/52_hires.png",
+    "nationalPokedexNumber": 440,
     "evolvesTo": [
       "Chansey"
     ]
@@ -2753,8 +2753,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/53_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2808,8 +2808,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/54_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2840,7 +2840,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Colorless Energy in the Defending Pokémon's Retreat Cost (after applying effects to the Retreat Cost)."
       },
       {
@@ -2866,8 +2866,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/55_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "dp2-56",
@@ -2917,8 +2917,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/56_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2972,8 +2972,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/57_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "dp2-58",
@@ -3025,8 +3025,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/58_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "dp2-59",
@@ -3081,8 +3081,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/59_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -3126,8 +3126,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/60_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -3187,8 +3187,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/61_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "dp2-62",
@@ -3230,8 +3230,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/62_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -3293,8 +3293,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 410,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/63_hires.png",
+    "nationalPokedexNumber": 410,
     "evolvesTo": [
       "Bastiodon"
     ]
@@ -3352,8 +3352,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/64_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "dp2-65",
@@ -3398,8 +3398,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/65_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp2-66",
@@ -3443,8 +3443,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/66_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp2-67",
@@ -3488,8 +3488,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/67_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp2-68",
@@ -3530,7 +3530,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -3540,8 +3540,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/68_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -3593,8 +3593,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/69_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -3646,8 +3646,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/70_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -3697,8 +3697,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/71_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -3746,8 +3746,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 339,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/72_hires.png",
+    "nationalPokedexNumber": 339,
     "evolvesTo": [
       "Whiscash"
     ]
@@ -3794,8 +3794,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/73_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -3844,8 +3844,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/74_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3891,8 +3891,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/75_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -3948,8 +3948,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/76_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -4006,8 +4006,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/77_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -4059,8 +4059,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/78_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -4112,8 +4112,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/79_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -4145,7 +4145,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -4171,8 +4171,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/80_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -4220,8 +4220,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/81_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -4263,8 +4263,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/82_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -4316,8 +4316,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 456,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/83_hires.png",
+    "nationalPokedexNumber": 456,
     "evolvesTo": [
       "Lumineon"
     ]
@@ -4366,8 +4366,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/84_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -4409,8 +4409,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/85_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -4462,8 +4462,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 401,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/86_hires.png",
+    "nationalPokedexNumber": 401,
     "evolvesTo": [
       "Kricketune"
     ]
@@ -4521,8 +4521,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/87_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -4569,8 +4569,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/88_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -4602,7 +4602,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Magikarp."
       },
       {
@@ -4622,8 +4622,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/89_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -4681,8 +4681,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/90_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -4734,8 +4734,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/91_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -4787,8 +4787,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/92_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -4841,8 +4841,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/93_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -4896,8 +4896,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/94_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4949,8 +4949,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/95_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -5008,8 +5008,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/96_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -5053,8 +5053,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/97_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -5105,8 +5105,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/98_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -5148,8 +5148,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/99_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -5200,8 +5200,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/100_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -5255,8 +5255,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 459,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/101_hires.png",
+    "nationalPokedexNumber": 459,
     "evolvesTo": [
       "Abomasnow"
     ]
@@ -5308,8 +5308,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/102_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -5351,7 +5351,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -5361,8 +5361,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/103_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -5404,8 +5404,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/104_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -5457,8 +5457,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/105_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -5509,8 +5509,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/106_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -5553,8 +5553,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/107_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -5612,8 +5612,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp2/108_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -5890,8 +5890,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/121_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/121_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "dp2-122",
@@ -5940,8 +5940,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/122_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "dp2-123",
@@ -5993,8 +5993,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/123_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp2/123_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "dp2-124",
diff --git a/json/cards/Neo Destiny.json b/json/cards/Neo Destiny.json
index 2b87b27a0..547ae4bb3 100644
--- a/json/cards/Neo Destiny.json	
+++ b/json/cards/Neo Destiny.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "neo4-2",
@@ -95,8 +95,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/2_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "neo4-3",
@@ -156,8 +156,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/3_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "neo4-4",
@@ -205,8 +205,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/4_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "neo4-5",
@@ -255,8 +255,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/5_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "neo4-6",
@@ -304,8 +304,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/6_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "neo4-7",
@@ -355,8 +355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/7_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "neo4-8",
@@ -409,8 +409,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/8_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -472,8 +472,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/9_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "neo4-10",
@@ -522,8 +522,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/10_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "neo4-11",
@@ -583,8 +583,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/11_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "neo4-12",
@@ -632,8 +632,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/12_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "neo4-13",
@@ -684,8 +684,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/13_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "neo4-14",
@@ -733,8 +733,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/14_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "neo4-15",
@@ -777,8 +777,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/15_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -850,8 +850,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/17_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "neo4-18",
@@ -899,8 +899,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/18_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "neo4-19",
@@ -951,8 +951,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/19_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "neo4-20",
@@ -999,8 +999,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/20_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "neo4-21",
@@ -1057,8 +1057,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/21_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "neo4-22",
@@ -1111,8 +1111,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/22_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1166,8 +1166,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/23_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "neo4-24",
@@ -1221,8 +1221,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/24_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "neo4-25",
@@ -1265,8 +1265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/25_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "neo4-26",
@@ -1316,8 +1316,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/26_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -1364,8 +1364,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/27_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-28",
@@ -1409,8 +1409,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/28_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-29",
@@ -1454,8 +1454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/29_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-30",
@@ -1499,8 +1499,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/30_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-31",
@@ -1558,8 +1558,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/31_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -1604,8 +1604,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/32_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -1659,8 +1659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/33_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "neo4-34",
@@ -1710,8 +1710,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/34_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1765,8 +1765,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/35_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "neo4-36",
@@ -1813,8 +1813,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/36_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -1856,8 +1856,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/37_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -1918,8 +1918,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/38_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -1972,8 +1972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/39_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2035,8 +2035,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/40_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "neo4-41",
@@ -2088,8 +2088,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/41_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "neo4-42",
@@ -2140,8 +2140,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/42_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "neo4-43",
@@ -2190,8 +2190,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/43_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -2240,8 +2240,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/44_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -2297,8 +2297,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/45_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "neo4-46",
@@ -2349,8 +2349,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/46_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "neo4-47",
@@ -2401,8 +2401,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/47_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "neo4-48",
@@ -2450,8 +2450,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/48_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "neo4-49",
@@ -2502,8 +2502,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/49_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2557,8 +2557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/50_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "neo4-51",
@@ -2609,8 +2609,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/51_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "neo4-52",
@@ -2661,8 +2661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/52_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "neo4-53",
@@ -2715,8 +2715,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/53_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "neo4-54",
@@ -2773,8 +2773,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/54_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "neo4-55",
@@ -2831,8 +2831,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/55_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -2884,8 +2884,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/56_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -2932,8 +2932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/57_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-58",
@@ -2972,8 +2972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/58_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-59",
@@ -3017,8 +3017,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/59_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-60",
@@ -3062,8 +3062,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/60_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-61",
@@ -3102,8 +3102,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/61_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -3157,8 +3157,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/62_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "neo4-63",
@@ -3206,8 +3206,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/63_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -3258,8 +3258,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/64_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -3298,8 +3298,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/65_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -3346,8 +3346,8 @@
         "text": "Does 10 damage plus 10 more damage for each Energy card attached to the Defending Pokémon."
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/66_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "neo4-67",
@@ -3390,8 +3390,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/67_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -3434,8 +3434,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/68_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3488,8 +3488,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/69_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "neo4-70",
@@ -3544,8 +3544,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/70_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -3591,8 +3591,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/71_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -3647,8 +3647,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 192,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/72_hires.png",
+    "nationalPokedexNumber": 192
   },
   {
     "id": "neo4-73",
@@ -3697,8 +3697,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/73_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3748,8 +3748,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/74_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "neo4-75",
@@ -3788,8 +3788,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/75_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3837,8 +3837,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/76_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3882,8 +3882,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/77_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3932,8 +3932,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/78_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -3985,8 +3985,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/79_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -4025,8 +4025,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/80_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -4069,8 +4069,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/81_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -4114,8 +4114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/82_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -4168,8 +4168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 191,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/83_hires.png",
+    "nationalPokedexNumber": 191,
     "evolvesTo": [
       "Sunflora"
     ]
@@ -4218,8 +4218,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/84_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -4261,8 +4261,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/85_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -4309,8 +4309,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/86_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-87",
@@ -4355,8 +4355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/87_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-88",
@@ -4401,8 +4401,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/88_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-89",
@@ -4446,8 +4446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/89_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo4-90",
@@ -4496,8 +4496,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/90_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -4540,8 +4540,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo4/91_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -4831,8 +4831,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/106_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "neo4-107",
@@ -4883,8 +4883,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/107_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "neo4-108",
@@ -4938,8 +4938,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/108_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "neo4-109",
@@ -4991,8 +4991,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/109_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "neo4-110",
@@ -5039,8 +5039,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/110_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "neo4-111",
@@ -5082,8 +5082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/111_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "neo4-112",
@@ -5134,8 +5134,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/112_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "neo4-113",
@@ -5165,7 +5165,7 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo4/113_hires.png",
+    "nationalPokedexNumber": 248
   }
 ]
diff --git a/json/cards/Neo Discovery.json b/json/cards/Neo Discovery.json
index a575081ad..61ca8a7d5 100644
--- a/json/cards/Neo Discovery.json	
+++ b/json/cards/Neo Discovery.json	
@@ -46,8 +46,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/1_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "neo2-2",
@@ -102,8 +102,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/2_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "neo2-3",
@@ -153,8 +153,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/3_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "neo2-4",
@@ -186,8 +186,8 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "",
-        "text": "Until the end of your next turn, if an attack damages the Defending Pokémon after applying Weakness and Resistance), that attack does 20 more damage to the Defending Pokémon."
+        "damage": "30",
+        "text": "Until the end of your next turn, if an attack damages the Defending Pokémon (after applying Weakness and Resistance), that attack does 20 more damage to the Defending Pokémon."
       },
       {
         "name": "Flamethrower",
@@ -207,8 +207,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/4_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "neo2-5",
@@ -257,8 +257,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/5_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -311,8 +311,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/6_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "neo2-7",
@@ -367,8 +367,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/7_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -421,8 +421,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/8_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "neo2-9",
@@ -476,8 +476,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/9_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "neo2-10",
@@ -535,8 +535,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/10_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "neo2-11",
@@ -582,8 +582,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/11_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "neo2-12",
@@ -639,8 +639,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/12_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "neo2-13",
@@ -692,8 +692,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/13_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "neo2-14",
@@ -737,8 +737,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/14_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-15",
@@ -799,8 +799,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/15_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "neo2-16",
@@ -841,8 +841,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/16_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "neo2-17",
@@ -895,8 +895,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/17_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -953,8 +953,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/18_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "neo2-19",
@@ -1012,8 +1012,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/19_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "neo2-20",
@@ -1065,8 +1065,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/20_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "neo2-21",
@@ -1121,8 +1121,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/21_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "neo2-22",
@@ -1172,8 +1172,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/22_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "neo2-23",
@@ -1226,8 +1226,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/23_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "neo2-24",
@@ -1276,8 +1276,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/24_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -1330,8 +1330,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/25_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "neo2-26",
@@ -1361,7 +1361,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "During your next turn, reat any tails flipped when using Magnemite's Electric Bolt attack on the Defending Pokémon as if they were heads. (Benching or evolving either Pokémon ends this effect.)"
+        "text": "During your next turn, treat any tails flipped when using Magnemite's Electric Bolt attack on the Defending Pokémon as if they were heads. (Benching or evolving either Pokémon ends this effect.)"
       },
       {
         "name": "Electric Bolt",
@@ -1386,8 +1386,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/26_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -1440,8 +1440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/27_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "neo2-28",
@@ -1495,8 +1495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/28_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "neo2-29",
@@ -1554,8 +1554,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/29_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "neo2-30",
@@ -1601,8 +1601,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/30_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "neo2-31",
@@ -1658,8 +1658,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/31_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "neo2-32",
@@ -1711,8 +1711,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/32_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "neo2-33",
@@ -1756,8 +1756,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/33_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-34",
@@ -1818,8 +1818,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/34_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "neo2-35",
@@ -1860,8 +1860,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/35_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "neo2-36",
@@ -1914,8 +1914,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/36_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -1967,8 +1967,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/37_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "neo2-38",
@@ -2018,8 +2018,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/38_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2078,8 +2078,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/39_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -2103,14 +2103,14 @@
     "series": "Neo",
     "set": "Neo Discovery",
     "setCode": "neo2",
-    "types": [
-      "Colorless"
-    ],
     "text": [
       "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
     ],
-    "nationalPokedexNumber": 174,
+    "types": [
+      "Colorless"
+    ],
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/40_hires.png",
+    "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
     ]
@@ -2155,8 +2155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/41_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -2211,8 +2211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/42_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -2267,8 +2267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/43_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "neo2-44",
@@ -2319,8 +2319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/44_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -2381,8 +2381,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/45_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2431,8 +2431,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/46_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -2479,8 +2479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/47_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-48",
@@ -2524,8 +2524,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/48_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-49",
@@ -2564,8 +2564,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/49_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-50",
@@ -2604,8 +2604,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/50_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-51",
@@ -2649,8 +2649,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/51_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-52",
@@ -2707,8 +2707,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/52_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "neo2-53",
@@ -2747,8 +2747,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/53_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -2793,8 +2793,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/54_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "neo2-55",
@@ -2836,8 +2836,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/55_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -2885,8 +2885,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/56_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -2934,8 +2934,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/57_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -2978,8 +2978,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/58_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3027,8 +3027,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/59_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -3075,8 +3075,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/60_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3119,8 +3119,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/61_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3171,8 +3171,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/62_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -3230,8 +3230,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/63_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -3274,8 +3274,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/64_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -3333,8 +3333,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/65_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -3353,6 +3353,9 @@
     "series": "Neo",
     "set": "Neo Discovery",
     "setCode": "neo2",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Fighting"
     ],
@@ -3367,11 +3370,8 @@
         "text": "Flip a coin. If tails, this attack does nothing."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 236,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/66_hires.png",
+    "nationalPokedexNumber": 236,
     "evolvesTo": [
       "Hitmonlee",
       "Hitmonchan",
@@ -3420,8 +3420,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/67_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-68",
@@ -3460,8 +3460,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/68_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-69",
@@ -3505,8 +3505,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo2/69_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo2-70",
@@ -3545,8 +3545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/70_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -3604,8 +3604,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo2/71_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
diff --git a/json/cards/Neo Genesis.json b/json/cards/Neo Genesis.json
index c3a5e3a62..0ad7e4586 100644
--- a/json/cards/Neo Genesis.json	
+++ b/json/cards/Neo Genesis.json	
@@ -40,8 +40,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "neo1-2",
@@ -93,8 +93,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/2_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "neo1-3",
@@ -146,8 +146,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/3_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "neo1-4",
@@ -197,8 +197,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/4_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "neo1-5",
@@ -242,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/5_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "neo1-6",
@@ -290,8 +290,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/6_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "neo1-7",
@@ -343,8 +343,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/7_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "neo1-8",
@@ -393,8 +393,8 @@
         "text": "If this attack doesn't Knock Out the Defending Pokémon, and if there are any Pokémon on your opponent's Bench, choose 1 of them and switch it with the Defending Pokémon."
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/8_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "neo1-9",
@@ -442,8 +442,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/9_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "neo1-10",
@@ -493,8 +493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/10_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "neo1-11",
@@ -544,8 +544,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/11_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "neo1-12",
@@ -561,6 +561,9 @@
     "series": "Neo",
     "set": "Neo Genesis",
     "setCode": "neo1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Lightning"
     ],
@@ -575,11 +578,8 @@
         "text": "Does 20 damage to each Pokémon in play that has a Pokémon Power. Don't apply Weakness and Resistance."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/12_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -639,8 +639,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/13_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "neo1-14",
@@ -689,8 +689,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/14_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "neo1-15",
@@ -751,8 +751,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/15_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "neo1-16",
@@ -800,8 +800,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/16_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -853,8 +853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/17_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "neo1-18",
@@ -903,8 +903,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/18_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "neo1-19",
@@ -937,6 +937,9 @@
     "series": "Neo",
     "set": "Neo Genesis",
     "setCode": "neo1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Colorless"
     ],
@@ -951,11 +954,8 @@
         "text": "Shuffle your hand into your deck, then draw 7 cards."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 173,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/20_hires.png",
+    "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
     ]
@@ -1017,8 +1017,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/21_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "neo1-22",
@@ -1027,6 +1027,11 @@
     "subtype": "Basic",
     "supertype": "Pokémon",
     "level": "6",
+    "ability": {
+      "name": "Playful Punch",
+      "text": "Once during your turn (before your attack), you may flip a coin. If heads, do 20 damage to your opponent's Active Pokémon. (Apply Weakness and Resistance.) Either way, this ends your turn. This power can't be used if Elekid is Asleep, Confused, or Paralyzed.",
+      "type": "Poké-Power"
+    },
     "hp": "30",
     "number": "22",
     "artist": "Miki Tanaka",
@@ -1034,22 +1039,17 @@
     "series": "Neo",
     "set": "Neo Genesis",
     "setCode": "neo1",
-    "types": [
-      "Lightning"
-    ],
     "text": [
       "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
     ],
-    "nationalPokedexNumber": 239,
+    "types": [
+      "Lightning"
+    ],
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/22_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
-    ],
-    "ability": {
-      "name": "Playful Punch",
-      "text": "Once during your turn (before your attack), you may flip a coin. If heads, do 20 damage to your opponent's Active Pokémon. (Apply Weakness and Resistance.) Either way, this ends your turn. This power can't be used if Elekid is Asleep, Confused, or Paralyzed.",
-      "type": "Poké-Power"
-    }
+    ]
   },
   {
     "id": "neo1-23",
@@ -1065,6 +1065,9 @@
     "series": "Neo",
     "set": "Neo Genesis",
     "setCode": "neo1",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Fire"
     ],
@@ -1079,11 +1082,8 @@
         "text": "All Pokémon Powers stop working until the end of your next turn."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/23_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -1132,8 +1132,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/24_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -1182,8 +1182,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/25_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -1237,8 +1237,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/26_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -1292,8 +1292,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/27_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "neo1-28",
@@ -1342,8 +1342,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/28_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -1398,8 +1398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/29_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -1459,8 +1459,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/30_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -1515,8 +1515,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/31_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -1572,8 +1572,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/32_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -1627,8 +1627,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/33_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1681,8 +1681,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/34_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1743,8 +1743,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/35_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "neo1-36",
@@ -1796,8 +1796,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/36_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -1860,8 +1860,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/37_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "neo1-38",
@@ -1907,8 +1907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/38_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "neo1-39",
@@ -1952,8 +1952,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/39_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "neo1-40",
@@ -2005,8 +2005,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/40_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2066,8 +2066,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/41_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "neo1-42",
@@ -2117,8 +2117,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/42_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "neo1-43",
@@ -2172,8 +2172,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/43_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -2236,8 +2236,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/44_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -2300,8 +2300,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/45_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "neo1-46",
@@ -2352,8 +2352,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/46_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2408,8 +2408,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/47_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2462,8 +2462,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/48_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2518,8 +2518,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/49_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -2564,8 +2564,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 192,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/50_hires.png",
+    "nationalPokedexNumber": 192
   },
   {
     "id": "neo1-51",
@@ -2605,8 +2605,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/51_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -2663,8 +2663,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/52_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "neo1-53",
@@ -2712,8 +2712,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/53_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -2765,8 +2765,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/54_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -2817,8 +2817,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/55_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2870,8 +2870,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/56_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -2923,8 +2923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/57_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -2968,8 +2968,8 @@
         "text": "Flip a coin. If heads, the Defending Pokémon is now Confused."
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/58_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "neo1-59",
@@ -3021,8 +3021,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/59_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -3080,8 +3080,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/60_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -3135,8 +3135,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/61_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -3176,8 +3176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/62_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -3232,8 +3232,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/63_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -3282,8 +3282,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/64_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "neo1-65",
@@ -3332,8 +3332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/65_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3385,8 +3385,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/66_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -3441,8 +3441,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/67_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -3494,8 +3494,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/68_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3548,8 +3548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/69_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3602,8 +3602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/70_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3651,8 +3651,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/71_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -3704,8 +3704,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/72_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "neo1-73",
@@ -3753,8 +3753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/73_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -3813,8 +3813,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/74_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -3865,8 +3865,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/75_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -3927,8 +3927,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/76_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "neo1-77",
@@ -3979,8 +3979,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo1/77_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "neo1-78",
@@ -4031,8 +4031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 191,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/78_hires.png",
+    "nationalPokedexNumber": 191,
     "evolvesTo": [
       "Sunflora"
     ]
@@ -4080,8 +4080,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/79_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -4133,8 +4133,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/80_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -4185,8 +4185,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/81_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -4244,8 +4244,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo1/82_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
diff --git a/json/cards/Neo Revelation.json b/json/cards/Neo Revelation.json
index 9aa34c9a5..0798498cc 100644
--- a/json/cards/Neo Revelation.json	
+++ b/json/cards/Neo Revelation.json	
@@ -51,8 +51,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "neo3-2",
@@ -107,8 +107,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/2_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "neo3-3",
@@ -152,8 +152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/3_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "neo3-4",
@@ -192,7 +192,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "20×",
-        "text": "(20x) Flip 4 coins. This attack does 20 damage times the number of heads. If you get 2 or more heads, the Defending Pokémon is now Confused."
+        "text": "Flip 4 coins. This attack does 20 damage times the number of heads. If you get 2 or more heads, the Defending Pokémon is now Confused."
       }
     ],
     "weaknesses": [
@@ -207,8 +207,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/4_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "neo3-5",
@@ -254,8 +254,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/5_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "neo3-6",
@@ -301,8 +301,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/6_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "neo3-7",
@@ -372,8 +372,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/7_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "neo3-8",
@@ -424,8 +424,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/8_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "neo3-9",
@@ -477,8 +477,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/9_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "neo3-10",
@@ -532,8 +532,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/10_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -586,8 +586,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/11_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -643,8 +643,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/12_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -693,8 +693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/13_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "neo3-14",
@@ -740,8 +740,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/14_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "neo3-15",
@@ -794,8 +794,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/15_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "neo3-16",
@@ -835,8 +835,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/16_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "neo3-17",
@@ -879,8 +879,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/17_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "neo3-18",
@@ -929,8 +929,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/18_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "neo3-19",
@@ -977,8 +977,8 @@
         "text": "Flip 2 coins. For each heads, choose an Energy card attached to the Defending Pokémon, if any, and discard it. If both are tails, this attack does nothing (not even damage)."
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/19_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "neo3-20",
@@ -1027,8 +1027,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/20_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "neo3-21",
@@ -1080,8 +1080,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/21_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "neo3-22",
@@ -1124,8 +1124,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/22_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "neo3-23",
@@ -1182,8 +1182,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/23_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "neo3-24",
@@ -1229,8 +1229,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/24_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -1284,8 +1284,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/25_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "neo3-26",
@@ -1323,7 +1323,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip 2 coins. This attack does 20 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -1332,8 +1332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/26_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "neo3-27",
@@ -1376,8 +1376,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/27_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "neo3-28",
@@ -1428,8 +1428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/28_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1485,8 +1485,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/29_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1542,8 +1542,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 75,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/30_hires.png",
+    "nationalPokedexNumber": 75,
     "evolvesTo": [
       "Golem"
     ]
@@ -1597,8 +1597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/31_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "neo3-32",
@@ -1646,8 +1646,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/32_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "neo3-33",
@@ -1696,8 +1696,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/33_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "neo3-34",
@@ -1749,8 +1749,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/34_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "neo3-35",
@@ -1792,8 +1792,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/35_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "neo3-36",
@@ -1854,8 +1854,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/36_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -1908,8 +1908,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/37_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "neo3-38",
@@ -1965,8 +1965,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/38_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "neo3-39",
@@ -2010,8 +2010,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/39_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo3-40",
@@ -2055,8 +2055,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/40_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo3-41",
@@ -2108,8 +2108,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/41_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -2160,8 +2160,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/42_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2220,8 +2220,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/43_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "neo3-44",
@@ -2260,8 +2260,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/44_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -2291,7 +2291,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10×",
-        "text": "(10x) Flip 2 coins. This attack does 10 damage times the number of heads."
+        "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
     "weaknesses": [
@@ -2300,8 +2300,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/45_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -2350,8 +2350,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/46_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -2403,8 +2403,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/47_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -2467,8 +2467,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/48_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "neo3-49",
@@ -2508,7 +2508,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "(20x) Flip a coin until you get tails. This attack does 20 damage times the number of heads you get."
+        "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads you get."
       }
     ],
     "weaknesses": [
@@ -2517,8 +2517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 211,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/49_hires.png",
+    "nationalPokedexNumber": 211
   },
   {
     "id": "neo3-50",
@@ -2554,8 +2554,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/50_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -2603,8 +2603,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/51_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "neo3-52",
@@ -2660,8 +2660,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/52_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -2714,8 +2714,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/53_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -2734,6 +2734,9 @@
     "series": "Neo",
     "set": "Neo Revelation",
     "setCode": "neo3",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Psychic"
     ],
@@ -2748,11 +2751,8 @@
         "text": "Flip a coin. If heads, choose a Special Energy card attached to 1 of your opponent's Pokémon. Your opponent shuffles that card into his or her deck."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 238,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/54_hires.png",
+    "nationalPokedexNumber": 238,
     "evolvesTo": [
       "Jynx"
     ]
@@ -2810,8 +2810,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/55_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -2862,8 +2862,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/56_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -2921,8 +2921,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/57_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -2969,8 +2969,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/58_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "neo3-59",
@@ -3021,8 +3021,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/59_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -3171,8 +3171,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/neo3/65_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "neo3-66",
@@ -3220,8 +3220,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/neo3/66_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
diff --git a/json/cards/Next Destinies.json b/json/cards/Next Destinies.json
index a056fb0c7..bd997b11e 100644
--- a/json/cards/Next Destinies.json	
+++ b/json/cards/Next Destinies.json	
@@ -48,8 +48,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/1_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "bw4-2",
@@ -93,8 +93,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/2_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -145,8 +145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 401,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/3_hires.png",
+    "nationalPokedexNumber": 401,
     "evolvesTo": [
       "Kricketune"
     ]
@@ -188,7 +188,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads. Heal from this Pokémon the same amount of damage you did to the Defending Pokémon."
       }
     ],
@@ -198,8 +198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 402,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/4_hires.png",
+    "nationalPokedexNumber": 402
   },
   {
     "id": "bw4-5",
@@ -256,8 +256,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/5_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "bw4-6",
@@ -302,8 +302,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/6_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -362,8 +362,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 512,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/7_hires.png",
+    "nationalPokedexNumber": 512
   },
   {
     "id": "bw4-8",
@@ -417,8 +417,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 590,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/8_hires.png",
+    "nationalPokedexNumber": 590,
     "evolvesTo": [
       "Amoonguss"
     ]
@@ -473,8 +473,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 591,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/9_hires.png",
+    "nationalPokedexNumber": 591
   },
   {
     "id": "bw4-10",
@@ -524,8 +524,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/10_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -568,8 +568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/11_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -620,8 +620,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/12_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "bw4-13",
@@ -674,8 +674,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/13_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "bw4-14",
@@ -734,8 +734,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/14_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "bw4-15",
@@ -774,8 +774,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/15_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -827,8 +827,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/16_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "bw4-17",
@@ -869,8 +869,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 554,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/17_hires.png",
+    "nationalPokedexNumber": 554,
     "evolvesTo": [
       "Darmanitan"
     ]
@@ -911,8 +911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/18_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -955,8 +955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 608,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/19_hires.png",
+    "nationalPokedexNumber": 608,
     "evolvesTo": [
       "Chandelure"
     ]
@@ -1009,8 +1009,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 609,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/20_hires.png",
+    "nationalPokedexNumber": 609
   },
   {
     "id": "bw4-21",
@@ -1061,8 +1061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/21_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw4-22",
@@ -1119,8 +1119,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/22_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw4-23",
@@ -1167,8 +1167,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/23_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -1216,8 +1216,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/24_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "bw4-25",
@@ -1266,8 +1266,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/25_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "bw4-26",
@@ -1318,8 +1318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/26_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "bw4-27",
@@ -1378,8 +1378,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/27_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "bw4-28",
@@ -1418,8 +1418,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 515,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/28_hires.png",
+    "nationalPokedexNumber": 515,
     "evolvesTo": [
       "Simipour"
     ]
@@ -1471,8 +1471,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 516,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/29_hires.png",
+    "nationalPokedexNumber": 516
   },
   {
     "id": "bw4-30",
@@ -1519,8 +1519,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 550,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/30_hires.png",
+    "nationalPokedexNumber": 550
   },
   {
     "id": "bw4-31",
@@ -1568,8 +1568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 582,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/31_hires.png",
+    "nationalPokedexNumber": 582,
     "evolvesTo": [
       "Vanillish"
     ]
@@ -1623,8 +1623,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 583,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/32_hires.png",
+    "nationalPokedexNumber": 583,
     "evolvesTo": [
       "Vanilluxe"
     ]
@@ -1674,8 +1674,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 584,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/33_hires.png",
+    "nationalPokedexNumber": 584
   },
   {
     "id": "bw4-34",
@@ -1724,8 +1724,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 592,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/34_hires.png",
+    "nationalPokedexNumber": 592,
     "evolvesTo": [
       "Jellicent"
     ]
@@ -1779,8 +1779,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 593,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/35_hires.png",
+    "nationalPokedexNumber": 593
   },
   {
     "id": "bw4-36",
@@ -1830,8 +1830,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 613,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/36_hires.png",
+    "nationalPokedexNumber": 613,
     "evolvesTo": [
       "Beartic"
     ]
@@ -1887,8 +1887,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 614,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/37_hires.png",
+    "nationalPokedexNumber": 614
   },
   {
     "id": "bw4-38",
@@ -1945,8 +1945,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/38_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw4-39",
@@ -1994,8 +1994,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/39_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -2038,7 +2038,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "80x",
+        "damage": "80×",
         "text": "Flip 2 coins. This attack does 80 damage times the number of heads."
       }
     ],
@@ -2048,8 +2048,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/40_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "bw4-41",
@@ -2092,7 +2092,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 4 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -2108,8 +2108,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/41_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "bw4-42",
@@ -2157,8 +2157,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/42_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -2199,8 +2199,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/43_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -2253,8 +2253,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/44_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -2283,7 +2283,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2303,8 +2303,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/45_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -2357,8 +2357,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/46_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "bw4-47",
@@ -2397,8 +2397,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 522,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/47_hires.png",
+    "nationalPokedexNumber": 522,
     "evolvesTo": [
       "Zebstrika"
     ]
@@ -2449,8 +2449,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 523,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/48_hires.png",
+    "nationalPokedexNumber": 523
   },
   {
     "id": "bw4-49",
@@ -2489,8 +2489,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/49_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "bw4-50",
@@ -2541,8 +2541,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/50_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw4-51",
@@ -2599,8 +2599,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/51_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw4-52",
@@ -2640,8 +2640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/52_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -2699,8 +2699,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/53_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "bw4-54",
@@ -2733,7 +2733,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to this Pokémon and the Defending Pokémon."
       },
       {
@@ -2754,8 +2754,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/54_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -2804,8 +2804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/55_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -2859,8 +2859,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/56_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -2912,8 +2912,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/57_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "bw4-58",
@@ -2953,8 +2953,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 517,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/58_hires.png",
+    "nationalPokedexNumber": 517,
     "evolvesTo": [
       "Musharna"
     ]
@@ -3004,8 +3004,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 518,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/59_hires.png",
+    "nationalPokedexNumber": 518
   },
   {
     "id": "bw4-60",
@@ -3046,7 +3046,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip a coin for each Energy attached to this Pokémon. This attack does 50 damage times the number of heads."
       }
     ],
@@ -3056,8 +3056,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 555,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/60_hires.png",
+    "nationalPokedexNumber": 555
   },
   {
     "id": "bw4-61",
@@ -3095,8 +3095,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/61_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -3149,8 +3149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 606,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/62_hires.png",
+    "nationalPokedexNumber": 606
   },
   {
     "id": "bw4-63",
@@ -3198,8 +3198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/63_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -3247,8 +3247,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/64_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "bw4-65",
@@ -3306,8 +3306,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/65_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -3372,8 +3372,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/66_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "bw4-67",
@@ -3401,7 +3401,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3411,8 +3411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 619,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/67_hires.png",
+    "nationalPokedexNumber": 619,
     "evolvesTo": [
       "Mienshao"
     ]
@@ -3464,8 +3464,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 620,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/68_hires.png",
+    "nationalPokedexNumber": 620
   },
   {
     "id": "bw4-69",
@@ -3519,8 +3519,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/69_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -3563,7 +3563,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -3579,8 +3579,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/70_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "bw4-71",
@@ -3626,8 +3626,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/71_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -3682,8 +3682,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/72_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "bw4-73",
@@ -3738,8 +3738,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/73_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -3799,8 +3799,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 560,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/74_hires.png",
+    "nationalPokedexNumber": 560
   },
   {
     "id": "bw4-75",
@@ -3858,8 +3858,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/75_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3917,8 +3917,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/76_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "bw4-77",
@@ -3965,8 +3965,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 597,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/77_hires.png",
+    "nationalPokedexNumber": 597,
     "evolvesTo": [
       "Ferrothorn"
     ]
@@ -4008,7 +4008,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4018,8 +4018,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/78_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -4053,7 +4053,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of your Pokémon that have the Round attack."
       },
       {
@@ -4074,8 +4074,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/79_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "bw4-80",
@@ -4103,7 +4103,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -4123,8 +4123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/80_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -4176,8 +4176,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/81_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "bw4-82",
@@ -4235,8 +4235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/82_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "bw4-83",
@@ -4290,8 +4290,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 519,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/83_hires.png",
+    "nationalPokedexNumber": 519,
     "evolvesTo": [
       "Tranquill"
     ]
@@ -4342,8 +4342,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 572,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/84_hires.png",
+    "nationalPokedexNumber": 572,
     "evolvesTo": [
       "Cinccino"
     ]
@@ -4392,8 +4392,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 573,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/85_hires.png",
+    "nationalPokedexNumber": 573
   },
   {
     "id": "bw4-86",
@@ -4587,8 +4587,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/94_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "bw4-95",
@@ -4645,8 +4645,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/95_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw4-96",
@@ -4703,8 +4703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/96_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw4-97",
@@ -4761,8 +4761,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/97_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw4-98",
@@ -4795,7 +4795,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to this Pokémon and the Defending Pokémon."
       },
       {
@@ -4816,8 +4816,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw4/98_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -4876,8 +4876,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/99_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "bw4-100",
@@ -4927,7 +4927,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 500,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw4/100_hires.png",
+    "nationalPokedexNumber": 500
   }
 ]
diff --git a/json/cards/Noble Victories.json b/json/cards/Noble Victories.json
index 0c766a77b..46aa845bd 100644
--- a/json/cards/Noble Victories.json	
+++ b/json/cards/Noble Victories.json	
@@ -26,7 +26,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -36,8 +36,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/1_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -89,8 +89,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 541,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/2_hires.png",
+    "nationalPokedexNumber": 541,
     "evolvesTo": [
       "Leavanny"
     ]
@@ -140,8 +140,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 542,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/3_hires.png",
+    "nationalPokedexNumber": 542
   },
   {
     "id": "bw3-4",
@@ -195,8 +195,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 548,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/4_hires.png",
+    "nationalPokedexNumber": 548,
     "evolvesTo": [
       "Lilligant"
     ]
@@ -254,8 +254,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 549,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/5_hires.png",
+    "nationalPokedexNumber": 549
   },
   {
     "id": "bw3-6",
@@ -304,8 +304,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 557,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/6_hires.png",
+    "nationalPokedexNumber": 557,
     "evolvesTo": [
       "Crustle"
     ]
@@ -361,8 +361,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 558,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/7_hires.png",
+    "nationalPokedexNumber": 558
   },
   {
     "id": "bw3-8",
@@ -400,7 +400,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -410,8 +410,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 588,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/8_hires.png",
+    "nationalPokedexNumber": 588,
     "evolvesTo": [
       "Escavalier"
     ]
@@ -458,8 +458,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 590,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/9_hires.png",
+    "nationalPokedexNumber": 590,
     "evolvesTo": [
       "Amoonguss"
     ]
@@ -518,8 +518,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 591,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/10_hires.png",
+    "nationalPokedexNumber": 591
   },
   {
     "id": "bw3-11",
@@ -568,8 +568,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 616,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/11_hires.png",
+    "nationalPokedexNumber": 616,
     "evolvesTo": [
       "Accelgor"
     ]
@@ -617,8 +617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 617,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/12_hires.png",
+    "nationalPokedexNumber": 617
   },
   {
     "id": "bw3-13",
@@ -672,8 +672,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/13_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw3-14",
@@ -717,8 +717,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/14_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw3-15",
@@ -757,8 +757,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/15_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw3-16",
@@ -808,8 +808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/16_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -853,7 +853,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "80x",
+        "damage": "80×",
         "text": "Flip 2 coins. This attack does 80 damage times the number of heads."
       }
     ],
@@ -863,8 +863,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/17_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "bw3-18",
@@ -913,8 +913,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 631,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/18_hires.png",
+    "nationalPokedexNumber": 631
   },
   {
     "id": "bw3-19",
@@ -953,8 +953,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/19_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -997,8 +997,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/20_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -1051,8 +1051,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/21_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "bw3-22",
@@ -1100,8 +1100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 535,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/22_hires.png",
+    "nationalPokedexNumber": 535,
     "evolvesTo": [
       "Palpitoad"
     ]
@@ -1145,7 +1145,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of your Pokémon that have the Round attack."
       }
     ],
@@ -1155,8 +1155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 536,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/23_hires.png",
+    "nationalPokedexNumber": 536,
     "evolvesTo": [
       "Seismitoad"
     ]
@@ -1191,7 +1191,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of your Pokémon that have the Round attack."
       },
       {
@@ -1212,8 +1212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/24_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "bw3-25",
@@ -1268,8 +1268,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 564,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/25_hires.png",
+    "nationalPokedexNumber": 564,
     "evolvesTo": [
       "Carracosta"
     ]
@@ -1322,8 +1322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 565,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/26_hires.png",
+    "nationalPokedexNumber": 565
   },
   {
     "id": "bw3-27",
@@ -1361,8 +1361,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 582,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/27_hires.png",
+    "nationalPokedexNumber": 582,
     "evolvesTo": [
       "Vanillish"
     ]
@@ -1416,8 +1416,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 583,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/28_hires.png",
+    "nationalPokedexNumber": 583,
     "evolvesTo": [
       "Vanilluxe"
     ]
@@ -1451,7 +1451,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads. If either of them is heads, the Defending Pokémon is now Paralyzed."
       },
       {
@@ -1471,8 +1471,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 584,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/29_hires.png",
+    "nationalPokedexNumber": 584
   },
   {
     "id": "bw3-30",
@@ -1512,8 +1512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 592,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/30_hires.png",
+    "nationalPokedexNumber": 592,
     "evolvesTo": [
       "Jellicent"
     ]
@@ -1563,8 +1563,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 593,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/31_hires.png",
+    "nationalPokedexNumber": 593
   },
   {
     "id": "bw3-32",
@@ -1612,8 +1612,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 615,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/32_hires.png",
+    "nationalPokedexNumber": 615
   },
   {
     "id": "bw3-33",
@@ -1661,8 +1661,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 615,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/33_hires.png",
+    "nationalPokedexNumber": 615
   },
   {
     "id": "bw3-34",
@@ -1713,8 +1713,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/34_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw3-35",
@@ -1752,8 +1752,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 522,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/35_hires.png",
+    "nationalPokedexNumber": 522,
     "evolvesTo": [
       "Zebstrika"
     ]
@@ -1806,8 +1806,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 523,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/36_hires.png",
+    "nationalPokedexNumber": 523
   },
   {
     "id": "bw3-37",
@@ -1845,8 +1845,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/37_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "bw3-38",
@@ -1884,8 +1884,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 602,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/38_hires.png",
+    "nationalPokedexNumber": 602,
     "evolvesTo": [
       "Eelektrik"
     ]
@@ -1923,8 +1923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 602,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/39_hires.png",
+    "nationalPokedexNumber": 602,
     "evolvesTo": [
       "Eelektrik"
     ]
@@ -1974,8 +1974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 603,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/40_hires.png",
+    "nationalPokedexNumber": 603,
     "evolvesTo": [
       "Eelektross"
     ]
@@ -2031,8 +2031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 604,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/41_hires.png",
+    "nationalPokedexNumber": 604
   },
   {
     "id": "bw3-42",
@@ -2083,8 +2083,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 618,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/42_hires.png",
+    "nationalPokedexNumber": 618
   },
   {
     "id": "bw3-43",
@@ -2122,8 +2122,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/43_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw3-44",
@@ -2161,8 +2161,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 562,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/44_hires.png",
+    "nationalPokedexNumber": 562,
     "evolvesTo": [
       "Cofagrigus"
     ]
@@ -2203,8 +2203,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 562,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/45_hires.png",
+    "nationalPokedexNumber": 562,
     "evolvesTo": [
       "Cofagrigus"
     ]
@@ -2260,8 +2260,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 563,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/46_hires.png",
+    "nationalPokedexNumber": 563
   },
   {
     "id": "bw3-47",
@@ -2307,8 +2307,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 563,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/47_hires.png",
+    "nationalPokedexNumber": 563
   },
   {
     "id": "bw3-48",
@@ -2356,8 +2356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/48_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -2413,8 +2413,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/49_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "bw3-50",
@@ -2452,8 +2452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 577,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/50_hires.png",
+    "nationalPokedexNumber": 577,
     "evolvesTo": [
       "Duosion"
     ]
@@ -2495,8 +2495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 578,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/51_hires.png",
+    "nationalPokedexNumber": 578,
     "evolvesTo": [
       "Reuniclus"
     ]
@@ -2538,7 +2538,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Does 40 damage times the number of Reuniclus you have in play."
       }
     ],
@@ -2548,8 +2548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/52_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "bw3-53",
@@ -2579,7 +2579,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -2600,8 +2600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/53_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "bw3-54",
@@ -2648,8 +2648,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/54_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -2700,8 +2700,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/55_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -2753,8 +2753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 606,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/56_hires.png",
+    "nationalPokedexNumber": 606
   },
   {
     "id": "bw3-57",
@@ -2793,8 +2793,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/57_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -2835,8 +2835,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/58_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -2888,8 +2888,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 608,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/59_hires.png",
+    "nationalPokedexNumber": 608,
     "evolvesTo": [
       "Chandelure"
     ]
@@ -2939,8 +2939,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 609,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/60_hires.png",
+    "nationalPokedexNumber": 609
   },
   {
     "id": "bw3-61",
@@ -2994,8 +2994,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 526,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/61_hires.png",
+    "nationalPokedexNumber": 526
   },
   {
     "id": "bw3-62",
@@ -3034,8 +3034,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 532,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/62_hires.png",
+    "nationalPokedexNumber": 532,
     "evolvesTo": [
       "Gurdurr"
     ]
@@ -3091,8 +3091,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 533,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/63_hires.png",
+    "nationalPokedexNumber": 533,
     "evolvesTo": [
       "Conkeldurr"
     ]
@@ -3145,8 +3145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 534,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/64_hires.png",
+    "nationalPokedexNumber": 534
   },
   {
     "id": "bw3-65",
@@ -3198,8 +3198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 534,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/65_hires.png",
+    "nationalPokedexNumber": 534
   },
   {
     "id": "bw3-66",
@@ -3250,8 +3250,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 566,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/66_hires.png",
+    "nationalPokedexNumber": 566,
     "evolvesTo": [
       "Archeops"
     ]
@@ -3301,8 +3301,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 567,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/67_hires.png",
+    "nationalPokedexNumber": 567
   },
   {
     "id": "bw3-68",
@@ -3331,7 +3331,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -3358,8 +3358,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 618,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/68_hires.png",
+    "nationalPokedexNumber": 618
   },
   {
     "id": "bw3-69",
@@ -3407,8 +3407,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 619,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/69_hires.png",
+    "nationalPokedexNumber": 619,
     "evolvesTo": [
       "Mienshao"
     ]
@@ -3460,8 +3460,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 620,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/70_hires.png",
+    "nationalPokedexNumber": 620
   },
   {
     "id": "bw3-71",
@@ -3508,8 +3508,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 622,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/71_hires.png",
+    "nationalPokedexNumber": 622,
     "evolvesTo": [
       "Golurk"
     ]
@@ -3558,7 +3558,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 4 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -3574,8 +3574,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/72_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "bw3-73",
@@ -3628,8 +3628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/73_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw3-74",
@@ -3684,8 +3684,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 645,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/74_hires.png",
+    "nationalPokedexNumber": 645
   },
   {
     "id": "bw3-75",
@@ -3713,7 +3713,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3729,8 +3729,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/75_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -3788,8 +3788,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/76_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "bw3-77",
@@ -3844,8 +3844,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/77_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -3878,7 +3878,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -3905,8 +3905,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/78_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -3964,8 +3964,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/79_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "bw3-80",
@@ -4008,7 +4008,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "70x",
+        "damage": "70×",
         "text": "Flip 2 coins. This attack does 70 damage times the number of heads."
       }
     ],
@@ -4024,8 +4024,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 589,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/80_hires.png",
+    "nationalPokedexNumber": 589
   },
   {
     "id": "bw3-81",
@@ -4079,8 +4079,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/81_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -4140,8 +4140,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/82_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "bw3-83",
@@ -4195,8 +4195,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 632,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/83_hires.png",
+    "nationalPokedexNumber": 632
   },
   {
     "id": "bw3-84",
@@ -4253,8 +4253,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/84_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bw3-85",
@@ -4284,7 +4284,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of your Benched Pokémon."
       }
     ],
@@ -4294,8 +4294,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 531,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/85_hires.png",
+    "nationalPokedexNumber": 531
   },
   {
     "id": "bw3-86",
@@ -4323,12 +4323,12 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/86_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -4371,12 +4371,12 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
-    "nationalPokedexNumber": 611,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/87_hires.png",
+    "nationalPokedexNumber": 611,
     "evolvesTo": [
       "Haxorus"
     ]
@@ -4410,7 +4410,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       },
       {
@@ -4425,8 +4425,8 @@
         "text": "This Pokémon can't attack during your next turn."
       }
     ],
-    "nationalPokedexNumber": 612,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/88_hires.png",
+    "nationalPokedexNumber": 612
   },
   {
     "id": "bw3-89",
@@ -4466,8 +4466,8 @@
         "text": "The Defending Pokémon can't retreat during your opponent's next turn."
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/89_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "bw3-90",
@@ -4641,8 +4641,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/97_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw3-98",
@@ -4686,8 +4686,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/98_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw3-99",
@@ -4740,8 +4740,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 639,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/99_hires.png",
+    "nationalPokedexNumber": 639
   },
   {
     "id": "bw3-100",
@@ -4798,8 +4798,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw3/100_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bw3-101",
@@ -4844,7 +4844,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -4864,8 +4864,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw3/102_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
diff --git a/json/cards/POP Series 1.json b/json/cards/POP Series 1.json
index 61fc7c127..fe3be6f4d 100644
--- a/json/cards/POP Series 1.json	
+++ b/json/cards/POP Series 1.json	
@@ -49,8 +49,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/1_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "pop1-2",
@@ -110,8 +110,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/2_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "pop1-3",
@@ -159,8 +159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/3_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "pop1-4",
@@ -217,8 +217,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/4_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "pop1-5",
@@ -269,8 +269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/5_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "pop1-6",
@@ -318,8 +318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/6_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "pop1-7",
@@ -372,8 +372,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/7_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "pop1-8",
@@ -423,8 +423,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop1/8_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -467,8 +467,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop1/9_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -520,8 +520,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/10_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "pop1-11",
@@ -559,8 +559,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop1/11_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -617,8 +617,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/12_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "pop1-13",
@@ -672,8 +672,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/13_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "pop1-14",
@@ -711,8 +711,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop1/14_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -723,8 +723,8 @@
     "imageUrl": "https://images.pokemontcg.io/pop1/15.png",
     "subtype": "Stage 1",
     "supertype": "Pokémon",
-    "hp": "70",
     "evolvesFrom": "Tailow",
+    "hp": "70",
     "retreatCost": [
       "Colorless"
     ],
@@ -770,8 +770,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/15_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "pop1-16",
@@ -779,8 +779,8 @@
     "imageUrl": "https://images.pokemontcg.io/pop1/16.png",
     "subtype": "Stage 2",
     "supertype": "Pokémon",
-    "hp": "160",
     "evolvesFrom": "Anorith",
+    "hp": "160",
     "retreatCost": [
       "Colorless",
       "Colorless",
@@ -830,8 +830,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/16_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "pop1-17",
@@ -839,8 +839,8 @@
     "imageUrl": "https://images.pokemontcg.io/pop1/17.png",
     "subtype": "Stage 2",
     "supertype": "Pokémon",
-    "hp": "150",
     "evolvesFrom": "Pupitar",
+    "hp": "150",
     "retreatCost": [
       "Colorless",
       "Colorless",
@@ -895,7 +895,7 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop1/17_hires.png",
+    "nationalPokedexNumber": 248
   }
 ]
diff --git a/json/cards/POP Series 2.json b/json/cards/POP Series 2.json
index 53cd50dea..ff13f119d 100644
--- a/json/cards/POP Series 2.json	
+++ b/json/cards/POP Series 2.json	
@@ -47,8 +47,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/1_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "pop2-2",
@@ -97,8 +97,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/2_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "pop2-3",
@@ -147,8 +147,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/3_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "pop2-4",
@@ -192,8 +192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/4_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "pop2-5",
@@ -243,8 +243,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/5_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "pop2-6",
@@ -299,8 +299,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/6_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "pop2-7",
@@ -329,7 +329,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10",
+        "damage": "",
         "text": "The Defending Pokémon is now Poisoned."
       },
       {
@@ -350,8 +350,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop2/7_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -470,8 +470,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop2/12_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -512,8 +512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop2/13_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -564,8 +564,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/14_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "pop2-15",
@@ -613,8 +613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop2/15_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -656,7 +656,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30",
-        "text": "Flip a coin. If tails, Pikachu does 10 damage to self."
+        "text": "Flip a coin. If tails, Pikachu does 10 damage to itself."
       }
     ],
     "weaknesses": [
@@ -665,8 +665,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop2/16_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -713,7 +713,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop2/17_hires.png",
+    "nationalPokedexNumber": 251
   }
 ]
diff --git a/json/cards/POP Series 3.json b/json/cards/POP Series 3.json
index 9087eda57..ce6051979 100644
--- a/json/cards/POP Series 3.json	
+++ b/json/cards/POP Series 3.json	
@@ -50,8 +50,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/1_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "pop3-2",
@@ -102,8 +102,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/2_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "pop3-3",
@@ -157,8 +157,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/3_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "pop3-4",
@@ -222,8 +222,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/4_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "pop3-5",
@@ -287,8 +287,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/5_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "pop3-6",
@@ -337,8 +337,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/6_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "pop3-7",
@@ -387,8 +387,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop3/7_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -440,8 +440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/8_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "pop3-9",
@@ -492,8 +492,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/9_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "pop3-10",
@@ -566,8 +566,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/12_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "pop3-13",
@@ -615,8 +615,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop3/13_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -675,8 +675,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop3/14_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -729,8 +729,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop3/15_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -772,21 +772,21 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop3/16_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
   },
   {
     "id": "pop3-17",
-    "name": "Ho-oh ex",
+    "name": "Ho-Oh ex",
     "imageUrl": "https://images.pokemontcg.io/pop3/17.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
     "ability": {
       "name": "Golden Wing",
-      "text": "If Ho-oh ex would be Knocked Out by damage from an opponent's attack, you may move 2 Energy attached to Ho-oh ex to your Pokémon in any way you like.",
+      "text": "If Ho-Oh ex would be Knocked Out by damage from an opponent's attack, you may move up to 2 Energy attached to Ho-Oh ex to your Pokémon in any way you like.",
       "type": "Poké-Power"
     },
     "hp": "110",
@@ -813,7 +813,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "10+",
-        "text": "Does 10 damage plus 20 more damage for each type of basic Energy card attached to Ho-oh ex."
+        "text": "Does 10 damage plus 20 more damage for each type of basic Energy card attached to Ho-Oh ex."
       }
     ],
     "weaknesses": [
@@ -822,7 +822,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop3/17_hires.png",
+    "nationalPokedexNumber": 250
   }
 ]
diff --git a/json/cards/POP Series 4.json b/json/cards/POP Series 4.json
index 71a2554b1..5ff53d53c 100644
--- a/json/cards/POP Series 4.json	
+++ b/json/cards/POP Series 4.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 358,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/1_hires.png",
+    "nationalPokedexNumber": 358
   },
   {
     "id": "pop4-2",
@@ -80,7 +80,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "",
+        "damage": "20",
         "text": "During your next turn, Deoxys's attacks do 40 more damage to the Defending Pokémon (before applying Weakness and Resistance)."
       }
     ],
@@ -90,8 +90,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/2_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "pop4-3",
@@ -149,8 +149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/3_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "pop4-4",
@@ -194,8 +194,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/4_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "pop4-5",
@@ -249,8 +249,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/5_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "pop4-6",
@@ -300,8 +300,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/6_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -359,8 +359,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/7_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -453,8 +453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/11_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -502,8 +502,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/12_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -545,8 +545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/13_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -592,8 +592,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/14_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -649,8 +649,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop4/15_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -702,8 +702,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/16_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "pop4-17",
@@ -726,6 +726,9 @@
     "series": "POP",
     "set": "POP Series 4",
     "setCode": "pop4",
+    "text": [
+      "When Pokémon-ex has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Psychic"
     ],
@@ -739,7 +742,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "50",
-        "text": "This attack's damage isn't affected by Resistance, Poké-Powers. Poké-Bodies, or any other effects on the Defending Pokémon."
+        "text": "This attack's damage isn't affected by Resistance, Poké-Powers, Poké-Bodies, or any other effects on the Defending Pokémon."
       }
     ],
     "weaknesses": [
@@ -748,7 +751,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop4/17_hires.png",
+    "nationalPokedexNumber": 386
   }
 ]
diff --git a/json/cards/POP Series 5.json b/json/cards/POP Series 5.json
index 295f27822..c6bac350f 100644
--- a/json/cards/POP Series 5.json	
+++ b/json/cards/POP Series 5.json	
@@ -49,8 +49,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/1_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "pop5-2",
@@ -101,8 +101,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/2_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "pop5-3",
@@ -149,8 +149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/3_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "pop5-4",
@@ -218,8 +218,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop5/5_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -338,8 +338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop5/10_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -380,8 +380,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop5/11_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -433,8 +433,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop5/12_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -485,8 +485,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop5/13_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -538,8 +538,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/14_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "pop5-15",
@@ -588,8 +588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/15_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "pop5-16",
@@ -634,8 +634,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/16_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "pop5-17",
@@ -685,7 +685,7 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop5/17_hires.png",
+    "nationalPokedexNumber": 197
   }
 ]
diff --git a/json/cards/POP Series 6.json b/json/cards/POP Series 6.json
index 745bcd606..2b67eb146 100644
--- a/json/cards/POP Series 6.json	
+++ b/json/cards/POP Series 6.json	
@@ -43,7 +43,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+40"
       }
     ],
     "resistances": [
@@ -52,8 +52,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 411,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/1_hires.png",
+    "nationalPokedexNumber": 411
   },
   {
     "id": "pop6-2",
@@ -100,11 +100,11 @@
     "weaknesses": [
       {
         "type": "Psychic",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/2_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "pop6-3",
@@ -150,11 +150,11 @@
     "weaknesses": [
       {
         "type": "Lightning",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/3_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "pop6-4",
@@ -199,7 +199,7 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -208,8 +208,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/4_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "pop6-5",
@@ -240,7 +240,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "",
+        "damage": "30",
         "text": "As long as the Defending Pokémon's remaining HP is 60 or less, this attack's base damage is 60 instead of 30."
       },
       {
@@ -252,17 +252,17 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "100",
-        "text": "Rampardos does 20 damage to itself. This attack's damage isn't affected by Weakness, Resistance, Poké-Powers, Poké-Bodies. or any other effects on the Defending Pokémon."
+        "text": "Rampardos does 20 damage to itself. This attack's damage isn't affected by Weakness, Resistance, Poké-Powers, Poké-Bodies, or any other effects on the Defending Pokémon."
       }
     ],
     "weaknesses": [
       {
         "type": "Grass",
-        "value": "×2"
+        "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 409,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop6/5_hires.png",
+    "nationalPokedexNumber": 409
   },
   {
     "id": "pop6-6",
@@ -292,7 +292,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Flip a coin. If heads, put 1 of your Benched Pokémon and all cards attacked to on top of your deck. Shuffle your deck afterward."
+        "text": "Flip a coin. If heads, put 1 of your Benched Pokémon and all cards attached to on top of your deck. Shuffle your deck afterward."
       },
       {
         "name": "Ominous Wind",
@@ -308,7 +308,7 @@
     "weaknesses": [
       {
         "type": "Darkness",
-        "value": "×2"
+        "value": "+10"
       }
     ],
     "resistances": [
@@ -317,8 +317,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/6_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -361,8 +361,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/7_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -394,18 +394,18 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "",
+        "damage": "30",
         "text": "Flip a coin. If tails, this attack does nothing."
       }
     ],
     "weaknesses": [
       {
         "type": "Psychic",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/8_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -454,8 +454,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/9_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -503,7 +503,7 @@
     "weaknesses": [
       {
         "type": "Lightning",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -512,8 +512,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/10_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -555,17 +555,17 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Search you discard pile for a Trainer card, show it to your opponent, and put it into your hand."
+        "text": "Search your discard pile for a Trainer card, show it to your opponent, and put it into your hand."
       }
     ],
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/11_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -614,11 +614,11 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/12_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -667,7 +667,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+10"
       }
     ],
     "resistances": [
@@ -676,8 +676,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/13_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -720,17 +720,17 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30",
-        "text": "Flip a coin. If tails, discard a Energy attached to Chimchar."
+        "text": "Flip a coin. If tails, discard a Fire Energy attached to Chimchar."
       }
     ],
     "weaknesses": [
       {
         "type": "Water",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/14_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -779,11 +779,11 @@
     "weaknesses": [
       {
         "type": "Lightning",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/15_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -832,7 +832,7 @@
     "weaknesses": [
       {
         "type": "Lightning",
-        "value": "×2"
+        "value": "+10"
       }
     ],
     "resistances": [
@@ -841,8 +841,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/16_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -891,7 +891,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+10"
       }
     ],
     "resistances": [
@@ -900,8 +900,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop6/17_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
diff --git a/json/cards/POP Series 7.json b/json/cards/POP Series 7.json
index 4368b4e17..140410fcd 100644
--- a/json/cards/POP Series 7.json	
+++ b/json/cards/POP Series 7.json	
@@ -37,13 +37,13 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "70",
-        "text": "You may discard all Energy attached to Ampharos. If you do, this attack does 20 damage to each of your opponent's Benched Pokémon that has any Energy cards attached to it. (Don't apply Weakness and Resistance for Benched Pokémon.)"
+        "text": "You may discard all Lightning Energy attached to Ampharos. If you do, this attack does 20 damage to each of your opponent's Benched Pokémon that has any Energy cards attached to it. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+30"
       }
     ],
     "resistances": [
@@ -52,8 +52,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "pop7-2",
@@ -86,7 +86,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "",
-        "text": "Put Damage counters on the Defending Pokémon until it is 50 HP away from being Knocked Out. If you do, your opponent switches the Defending Pokémon with 1 of his or her Benched Pokémon."
+        "text": "Put damage counters on the Defending Pokémon until it is 50 HP away from being Knocked Out. If you do, your opponent switches the Defending Pokémon with 1 of his or her Benched Pokémon."
       },
       {
         "name": "Psychic Cut",
@@ -96,18 +96,18 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "",
-        "text": "You may choose as many of your face-down Prize cards as you like and put them face up. If you do, this attack does 60 damge plus 20 more damage for each Prize card you chose. (These cards remain face up for the rest of the game.)"
+        "damage": "60+",
+        "text": "You may choose as many of your face-down Prize cards as you like and put them face up. If you do, this attack does 60 damage plus 20 more damage for each Prize card you chose. (These cards remain face up for the rest of the game.)"
       }
     ],
     "weaknesses": [
       {
         "type": "Psychic",
-        "value": "×2"
+        "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/2_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "pop7-3",
@@ -137,7 +137,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Remove 1 damage counter and all Special Conditions from Latias."
+        "text": "Remove 2 damage counters and all Special Conditions from Latias."
       },
       {
         "name": "Mist Ball",
@@ -148,13 +148,13 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "80",
-        "text": "Discard a Energy and a Energy attached to Latias."
+        "text": "Discard a Fire Energy and a Water Energy attached to Latias."
       }
     ],
     "weaknesses": [
       {
         "type": "Colorless",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -163,8 +163,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/3_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "pop7-4",
@@ -213,7 +213,7 @@
     "weaknesses": [
       {
         "type": "Colorless",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -222,8 +222,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/4_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "pop7-5",
@@ -267,7 +267,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -276,8 +276,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 414,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/5_hires.png",
+    "nationalPokedexNumber": 414,
     "evolvesTo": [
       "Burmy"
     ]
@@ -325,11 +325,11 @@
     "weaknesses": [
       {
         "type": "Metal",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/6_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "pop7-7",
@@ -360,7 +360,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10",
-        "text": "Search your deck for a Energy card and attach it to 1 of your Pokémon. Shuffle your deck afterward."
+        "text": "Search your deck for a Lightning Energy card and attach it to 1 of your Pokémon. Shuffle your deck afterward."
       },
       {
         "name": "Electromagnetic Kick",
@@ -377,7 +377,7 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -386,8 +386,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/7_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -431,18 +431,18 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40",
+        "damage": "",
         "text": "Choose 1 of your opponent's Pokémon. This attack does 40 damage to that Pokémon. This attack's damage isn't affected by Weakness or Resistance."
       }
     ],
     "weaknesses": [
       {
         "type": "Psychic",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/8_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -492,11 +492,11 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/9_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "pop7-10",
@@ -534,13 +534,13 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "40+",
-        "text": "Does 40 damage plus 10 more damage for each Energy attached to Wormadam Sandy Cloak."
+        "text": "Does 40 damage plus 10 more damage for each Fighting Energy attached to Wormadam Sandy Cloak."
       }
     ],
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -549,8 +549,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/10_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -588,17 +588,17 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10+",
-        "text": "If Burmy Plant Cloak has any Energy attached to it, this attack does 10 damage plus 10 more damage."
+        "text": "If Burmy Plant Cloak has any Grass Energy attached to it, this attack does 10 damage plus 10 more damage."
       }
     ],
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/11_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -636,17 +636,17 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10+",
-        "text": "If Burmy Sandy Cloak has any Energy attached to it, this attack does 10 damage plus 10 more damage."
+        "text": "If Burmy Sandy Cloak has any Fighting Energy attached to it, this attack does 10 damage plus 10 more damage."
       }
     ],
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/12_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -679,7 +679,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Search your deck for up to 3 different types of Basic Pokémon and put them on your Bench. Shuffle your deck afterward."
+        "text": "Search your deck for up to 3 different types of Basic Pokémon and put them onto your Bench. Shuffle your deck afterward."
       },
       {
         "name": "Hook",
@@ -695,11 +695,11 @@
     "weaknesses": [
       {
         "type": "Grass",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/13_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "pop7-14",
@@ -745,7 +745,7 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+10"
       }
     ],
     "resistances": [
@@ -754,8 +754,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/14_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -803,11 +803,11 @@
     "weaknesses": [
       {
         "type": "Psychic",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/15_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -840,7 +840,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Look at the top 2 cards of your deck, choose 1 of them and put it into your hand. Put the other on the bottom of your deck."
+        "text": "Look at the top 2 cards of your deck, choose 1 of them, and put it into your hand. Put the other card on the bottom of your deck."
       },
       {
         "name": "Scratch",
@@ -855,11 +855,11 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop7/16_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -907,10 +907,10 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop7/17_hires.png",
+    "nationalPokedexNumber": 327
   }
 ]
diff --git a/json/cards/POP Series 8.json b/json/cards/POP Series 8.json
index d12a2b116..611609ba2 100644
--- a/json/cards/POP Series 8.json	
+++ b/json/cards/POP Series 8.json	
@@ -51,8 +51,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/1_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "pop8-2",
@@ -104,8 +104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/2_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "pop8-3",
@@ -159,8 +159,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/3_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "pop8-4",
@@ -220,8 +220,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/4_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "pop8-5",
@@ -276,8 +276,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/5_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "pop8-6",
@@ -325,7 +325,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -334,8 +334,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/6_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "pop8-7",
@@ -365,7 +365,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "",
+        "damage": "30",
         "text": "Before doing damage, count the remaining HP of the Defending Pokémon and Carnivine. If the Defending Pokémon has fewer remaining HP than Carnivine's, this attack does 60 damage instead."
       },
       {
@@ -382,7 +382,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -391,8 +391,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop8/7_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "pop8-8",
@@ -436,7 +436,7 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+20"
       }
     ],
     "resistances": [
@@ -445,8 +445,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 404,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/8_hires.png",
+    "nationalPokedexNumber": 404,
     "evolvesTo": [
       "Luxray"
     ]
@@ -540,17 +540,17 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30",
-        "text": "Flip a coin. If tails, discard a Energy attached to Chimchar."
+        "text": "Flip a coin. If tails, discard a Fire Energy attached to Chimchar."
       }
     ],
     "weaknesses": [
       {
         "type": "Water",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/12_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -592,18 +592,18 @@
           "Psychic"
         ],
         "convertedEnergyCost": 2,
-        "damage": "",
+        "damage": "20",
         "text": "Flip a coin. If heads, the Defending Pokémon is now Poisoned."
       }
     ],
     "weaknesses": [
       {
         "type": "Psychic",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/13_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -647,11 +647,11 @@
     "weaknesses": [
       {
         "type": "Fighting",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 440,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/14_hires.png",
+    "nationalPokedexNumber": 440,
     "evolvesTo": [
       "Chansey"
     ]
@@ -700,11 +700,11 @@
     "weaknesses": [
       {
         "type": "Lightning",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/15_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -751,8 +751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/16_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -801,7 +801,7 @@
     "weaknesses": [
       {
         "type": "Fire",
-        "value": "×2"
+        "value": "+10"
       }
     ],
     "resistances": [
@@ -810,8 +810,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop8/17_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
diff --git a/json/cards/POP Series 9.json b/json/cards/POP Series 9.json
index 980b2c5fa..9d96f8c75 100644
--- a/json/cards/POP Series 9.json	
+++ b/json/cards/POP Series 9.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/1_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "pop9-2",
@@ -94,8 +94,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/2_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "pop9-3",
@@ -153,8 +153,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/3_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "pop9-4",
@@ -210,8 +210,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/4_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "pop9-5",
@@ -262,8 +262,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/5_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pop9-6",
@@ -312,8 +312,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/6_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -366,8 +366,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/7_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -421,8 +421,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/8_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -477,8 +477,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/9_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "pop9-10",
@@ -533,8 +533,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pop9/10_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "pop9-11",
@@ -584,8 +584,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/11_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -637,8 +637,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/12_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -691,8 +691,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/13_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -731,11 +731,11 @@
     "weaknesses": [
       {
         "type": "Colorless",
-        "value": "×2"
+        "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/14_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -794,8 +794,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/15_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -848,8 +848,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/16_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -909,8 +909,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/pop9/17_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
diff --git a/json/cards/Phantom Forces.json b/json/cards/Phantom Forces.json
index f4c9e607a..123ff30e6 100644
--- a/json/cards/Phantom Forces.json	
+++ b/json/cards/Phantom Forces.json	
@@ -36,8 +36,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/1_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -90,8 +90,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/2_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "xy4-3",
@@ -136,8 +136,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/3_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -193,8 +193,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/4_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "xy4-5",
@@ -242,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/5_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -296,8 +296,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 541,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/6_hires.png",
+    "nationalPokedexNumber": 541,
     "evolvesTo": [
       "Leavanny"
     ]
@@ -350,8 +350,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 542,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/7_hires.png",
+    "nationalPokedexNumber": 542
   },
   {
     "id": "xy4-8",
@@ -399,8 +399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 588,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/8_hires.png",
+    "nationalPokedexNumber": 588,
     "evolvesTo": [
       "Escavalier"
     ]
@@ -459,8 +459,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 662,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/9_hires.png",
+    "nationalPokedexNumber": 662,
     "evolvesTo": [
       "Talonflame"
     ]
@@ -519,8 +519,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 663,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/10_hires.png",
+    "nationalPokedexNumber": 663
   },
   {
     "id": "xy4-11",
@@ -569,8 +569,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 667,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/11_hires.png",
+    "nationalPokedexNumber": 667,
     "evolvesTo": [
       "Pyroar"
     ]
@@ -621,8 +621,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 668,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/12_hires.png",
+    "nationalPokedexNumber": 668
   },
   {
     "id": "xy4-13",
@@ -672,8 +672,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 98,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/13_hires.png",
+    "nationalPokedexNumber": 98,
     "evolvesTo": [
       "Kingler"
     ]
@@ -729,8 +729,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 99,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/14_hires.png",
+    "nationalPokedexNumber": 99
   },
   {
     "id": "xy4-15",
@@ -758,7 +758,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -768,8 +768,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/15_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -824,8 +824,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/16_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -883,8 +883,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/17_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "xy4-18",
@@ -922,8 +922,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 456,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/18_hires.png",
+    "nationalPokedexNumber": 456,
     "evolvesTo": [
       "Lumineon"
     ]
@@ -975,8 +975,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 457,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/19_hires.png",
+    "nationalPokedexNumber": 457
   },
   {
     "id": "xy4-20",
@@ -1015,8 +1015,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 592,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/20_hires.png",
+    "nationalPokedexNumber": 592,
     "evolvesTo": [
       "Jellicent"
     ]
@@ -1071,8 +1071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 593,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/21_hires.png",
+    "nationalPokedexNumber": 593
   },
   {
     "id": "xy4-22",
@@ -1124,8 +1124,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 594,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/22_hires.png",
+    "nationalPokedexNumber": 594
   },
   {
     "id": "xy4-23",
@@ -1179,8 +1179,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/23_hires.png",
+    "nationalPokedexNumber": 310,
     "evolvesTo": "M Manectric-EX"
   },
   {
@@ -1224,8 +1224,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/24_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "xy4-24a",
@@ -1268,8 +1268,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/24a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/24a_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "xy4-25",
@@ -1323,8 +1323,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/25_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "xy4-26",
@@ -1362,7 +1362,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of Pokémon in your discard pile that have the Night March attack."
       }
     ],
@@ -1378,8 +1378,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/26_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -1438,8 +1438,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 596,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/27_hires.png",
+    "nationalPokedexNumber": 596
   },
   {
     "id": "xy4-28",
@@ -1484,8 +1484,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 694,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/28_hires.png",
+    "nationalPokedexNumber": 694,
     "evolvesTo": [
       "Heliolisk"
     ]
@@ -1543,8 +1543,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 694,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/29_hires.png",
+    "nationalPokedexNumber": 694,
     "evolvesTo": [
       "Heliolisk"
     ]
@@ -1586,7 +1586,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard as many Lightning Energy attached to your Pokémon as you like. This attack does 30 damage times the number of Energy cards you discarded."
       }
     ],
@@ -1602,8 +1602,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 695,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/30_hires.png",
+    "nationalPokedexNumber": 695
   },
   {
     "id": "xy4-31",
@@ -1647,8 +1647,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/31_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -1698,8 +1698,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/32_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1749,8 +1749,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/33_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "xy4-34",
@@ -1806,8 +1806,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/34_hires.png",
+    "nationalPokedexNumber": 94,
     "evolvesTo": "M Gengar-EX"
   },
   {
@@ -1858,8 +1858,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/35_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "xy4-36",
@@ -1904,8 +1904,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/36_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "xy4-37",
@@ -1955,8 +1955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 316,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/37_hires.png",
+    "nationalPokedexNumber": 316,
     "evolvesTo": [
       "Swalot"
     ]
@@ -2012,8 +2012,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 317,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/38_hires.png",
+    "nationalPokedexNumber": 317
   },
   {
     "id": "xy4-39",
@@ -2052,7 +2052,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2062,8 +2062,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 517,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/39_hires.png",
+    "nationalPokedexNumber": 517,
     "evolvesTo": [
       "Musharna"
     ]
@@ -2116,8 +2116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 518,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/40_hires.png",
+    "nationalPokedexNumber": 518
   },
   {
     "id": "xy4-41",
@@ -2161,8 +2161,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/41_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -2206,7 +2206,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of Pokémon in your discard pile that have the Night March attack."
       }
     ],
@@ -2222,8 +2222,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 608,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/42_hires.png",
+    "nationalPokedexNumber": 608,
     "evolvesTo": [
       "Chandelure"
     ]
@@ -2279,8 +2279,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 609,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/43_hires.png",
+    "nationalPokedexNumber": 609
   },
   {
     "id": "xy4-44",
@@ -2320,7 +2320,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of Pokémon in your discard pile that have the Night March attack."
       }
     ],
@@ -2336,8 +2336,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 710,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/44_hires.png",
+    "nationalPokedexNumber": 710,
     "evolvesTo": [
       "Gourgeist"
     ]
@@ -2378,7 +2378,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "This attack does 10 damage times the number of cards in your hand."
       }
     ],
@@ -2394,8 +2394,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 711,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/45_hires.png",
+    "nationalPokedexNumber": 711
   },
   {
     "id": "xy4-46",
@@ -2424,7 +2424,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2434,8 +2434,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/46_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -2488,8 +2488,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/47_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "xy4-48",
@@ -2530,8 +2530,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 524,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/48_hires.png",
+    "nationalPokedexNumber": 524,
     "evolvesTo": [
       "Boldore"
     ]
@@ -2586,8 +2586,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 525,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/49_hires.png",
+    "nationalPokedexNumber": 525,
     "evolvesTo": [
       "Gigalith"
     ]
@@ -2639,8 +2639,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 526,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/50_hires.png",
+    "nationalPokedexNumber": 526
   },
   {
     "id": "xy4-51",
@@ -2695,8 +2695,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/51_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -2755,8 +2755,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/52_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "xy4-53",
@@ -2810,8 +2810,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/53_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -2871,8 +2871,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/54_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "xy4-55",
@@ -2914,8 +2914,8 @@
         "text": "Flip a coin. If heads, your opponent's Active Pokémon is now Confused."
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/55_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "xy4-56",
@@ -2959,8 +2959,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/56_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -3018,8 +3018,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 510,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/57_hires.png",
+    "nationalPokedexNumber": 510
   },
   {
     "id": "xy4-58",
@@ -3054,7 +3054,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip a coin for each Energy attached to this Pokémon. This attack does 60 damage times the number of heads."
       }
     ],
@@ -3070,8 +3070,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 687,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/58_hires.png",
+    "nationalPokedexNumber": 687
   },
   {
     "id": "xy4-59",
@@ -3127,8 +3127,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/59_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "xy4-60",
@@ -3172,8 +3172,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/60_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3230,8 +3230,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/61_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "xy4-62",
@@ -3290,8 +3290,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/62_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "xy4-63",
@@ -3351,8 +3351,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/63_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "xy4-64",
@@ -3410,8 +3410,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 589,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/64_hires.png",
+    "nationalPokedexNumber": 589
   },
   {
     "id": "xy4-65",
@@ -3464,8 +3464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 681,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/65_hires.png",
+    "nationalPokedexNumber": 681
   },
   {
     "id": "xy4-65a",
@@ -3518,8 +3518,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 681,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/65a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/65a_hires.png",
+    "nationalPokedexNumber": 681
   },
   {
     "id": "xy4-66",
@@ -3573,8 +3573,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 707,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/66_hires.png",
+    "nationalPokedexNumber": 707
   },
   {
     "id": "xy4-67",
@@ -3613,7 +3613,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of Grass Pokémon and Fairy Pokémon you have in play."
       }
     ],
@@ -3629,8 +3629,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 671,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/67_hires.png",
+    "nationalPokedexNumber": 671
   },
   {
     "id": "xy4-68",
@@ -3684,8 +3684,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 684,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/68_hires.png",
+    "nationalPokedexNumber": 684,
     "evolvesTo": [
       "Slurpuff"
     ]
@@ -3740,8 +3740,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 685,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/69_hires.png",
+    "nationalPokedexNumber": 685
   },
   {
     "id": "xy4-70",
@@ -3796,8 +3796,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 702,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/70_hires.png",
+    "nationalPokedexNumber": 702
   },
   {
     "id": "xy4-71",
@@ -3852,8 +3852,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 719,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/71_hires.png",
+    "nationalPokedexNumber": 719
   },
   {
     "id": "xy4-72",
@@ -3892,8 +3892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/72_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -3927,7 +3927,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -3937,8 +3937,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/73_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -3990,8 +3990,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/74_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "xy4-75",
@@ -4040,8 +4040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 704,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/75_hires.png",
+    "nationalPokedexNumber": 704,
     "evolvesTo": [
       "Sliggoo"
     ]
@@ -4096,8 +4096,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 705,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/76_hires.png",
+    "nationalPokedexNumber": 705,
     "evolvesTo": [
       "Goodra"
     ]
@@ -4149,8 +4149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 706,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/77_hires.png",
+    "nationalPokedexNumber": 706
   },
   {
     "id": "xy4-78",
@@ -4194,8 +4194,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/78_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4255,8 +4255,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/79_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "xy4-80",
@@ -4307,8 +4307,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/80_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -4344,7 +4344,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin. If heads, this attack does 10 damage times the number of damage counters on each of your Benched Pokémon."
       },
       {
@@ -4366,8 +4366,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/81_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "xy4-82",
@@ -4417,8 +4417,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/82_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "xy4-83",
@@ -4456,8 +4456,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/83_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -4512,8 +4512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/84_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -4570,8 +4570,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/85_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "xy4-86",
@@ -4626,8 +4626,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/86_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "xy4-87",
@@ -4676,8 +4676,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 659,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/87_hires.png",
+    "nationalPokedexNumber": 659,
     "evolvesTo": [
       "Diggersby"
     ]
@@ -4732,8 +4732,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 660,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/88_hires.png",
+    "nationalPokedexNumber": 660
   },
   {
     "id": "xy4-89",
@@ -4787,8 +4787,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/89_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -4841,8 +4841,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 676,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/90_hires.png",
+    "nationalPokedexNumber": 676
   },
   {
     "id": "xy4-91",
@@ -5281,8 +5281,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/113_hires.png",
+    "nationalPokedexNumber": 310,
     "evolvesTo": "M Manectric-EX"
   },
   {
@@ -5339,8 +5339,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy4/114_hires.png",
+    "nationalPokedexNumber": 94,
     "evolvesTo": "M Gengar-EX"
   },
   {
@@ -5376,7 +5376,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip a coin for each Energy attached to this Pokémon. This attack does 60 damage times the number of heads."
       }
     ],
@@ -5392,8 +5392,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 687,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/115_hires.png",
+    "nationalPokedexNumber": 687
   },
   {
     "id": "xy4-116",
@@ -5432,7 +5432,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of Grass Pokémon and Fairy Pokémon you have in play."
       }
     ],
@@ -5448,8 +5448,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 671,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/116_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy4/116_hires.png",
+    "nationalPokedexNumber": 671
   },
   {
     "id": "xy4-117",
diff --git a/json/cards/Plasma Blast.json b/json/cards/Plasma Blast.json
index 798fcc8e9..e434b67c1 100644
--- a/json/cards/Plasma Blast.json	
+++ b/json/cards/Plasma Blast.json	
@@ -35,8 +35,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/1_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -85,8 +85,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/2_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "bw10-3",
@@ -140,8 +140,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/3_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -201,8 +201,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/4_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "bw10-5",
@@ -256,8 +256,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/5_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "bw10-6",
@@ -296,8 +296,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 588,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/6_hires.png",
+    "nationalPokedexNumber": 588,
     "evolvesTo": [
       "Escavalier"
     ]
@@ -350,8 +350,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 616,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/7_hires.png",
+    "nationalPokedexNumber": 616,
     "evolvesTo": [
       "Accelgor"
     ]
@@ -400,8 +400,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 617,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/8_hires.png",
+    "nationalPokedexNumber": 617
   },
   {
     "id": "bw10-9",
@@ -454,8 +454,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/9_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw10-10",
@@ -504,8 +504,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/10_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "bw10-11",
@@ -553,8 +553,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/11_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "bw10-12",
@@ -604,8 +604,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/12_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -658,8 +658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/13_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "bw10-14",
@@ -707,8 +707,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/14_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -752,7 +752,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -762,8 +762,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/15_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -816,8 +816,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/16_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "bw10-17",
@@ -869,8 +869,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/17_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "bw10-18",
@@ -909,8 +909,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/18_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -962,8 +962,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/19_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "bw10-20",
@@ -1009,8 +1009,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/20_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "bw10-21",
@@ -1059,8 +1059,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/21_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -1116,8 +1116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/22_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "bw10-23",
@@ -1162,8 +1162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 478,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/23_hires.png",
+    "nationalPokedexNumber": 478
   },
   {
     "id": "bw10-24",
@@ -1211,8 +1211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/24_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "bw10-25",
@@ -1263,8 +1263,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 459,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/25_hires.png",
+    "nationalPokedexNumber": 459,
     "evolvesTo": [
       "Abomasnow"
     ]
@@ -1319,8 +1319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 460,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/26_hires.png",
+    "nationalPokedexNumber": 460
   },
   {
     "id": "bw10-27",
@@ -1360,7 +1360,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1370,8 +1370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 564,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/27_hires.png",
+    "nationalPokedexNumber": 564,
     "evolvesTo": [
       "Carracosta"
     ]
@@ -1430,8 +1430,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 565,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/28_hires.png",
+    "nationalPokedexNumber": 565
   },
   {
     "id": "bw10-29",
@@ -1476,8 +1476,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 580,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/29_hires.png",
+    "nationalPokedexNumber": 580,
     "evolvesTo": [
       "Swanna"
     ]
@@ -1536,8 +1536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/30_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw10-31",
@@ -1575,8 +1575,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 602,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/31_hires.png",
+    "nationalPokedexNumber": 602,
     "evolvesTo": [
       "Eelektrik"
     ]
@@ -1628,8 +1628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 603,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/32_hires.png",
+    "nationalPokedexNumber": 603,
     "evolvesTo": [
       "Eelektross"
     ]
@@ -1664,7 +1664,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard as many Energy attached to your Pokémon as you like. This attack does 30 damage times the number of Energy cards you discarded."
       },
       {
@@ -1676,7 +1676,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 4 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -1686,8 +1686,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 604,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/33_hires.png",
+    "nationalPokedexNumber": 604
   },
   {
     "id": "bw10-34",
@@ -1737,8 +1737,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/34_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -1784,8 +1784,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/35_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "bw10-36",
@@ -1823,8 +1823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 480,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/36_hires.png",
+    "nationalPokedexNumber": 480
   },
   {
     "id": "bw10-37",
@@ -1869,8 +1869,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 481,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/37_hires.png",
+    "nationalPokedexNumber": 481
   },
   {
     "id": "bw10-38",
@@ -1919,8 +1919,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 482,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/38_hires.png",
+    "nationalPokedexNumber": 482
   },
   {
     "id": "bw10-39",
@@ -1968,8 +1968,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 517,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/39_hires.png",
+    "nationalPokedexNumber": 517,
     "evolvesTo": [
       "Musharna"
     ]
@@ -2024,8 +2024,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 518,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/40_hires.png",
+    "nationalPokedexNumber": 518
   },
   {
     "id": "bw10-41",
@@ -2076,8 +2076,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/41_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "bw10-42",
@@ -2115,8 +2115,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 577,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/42_hires.png",
+    "nationalPokedexNumber": 577,
     "evolvesTo": [
       "Duosion"
     ]
@@ -2159,8 +2159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 578,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/43_hires.png",
+    "nationalPokedexNumber": 578,
     "evolvesTo": [
       "Reuniclus"
     ]
@@ -2214,8 +2214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 579,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/44_hires.png",
+    "nationalPokedexNumber": 579
   },
   {
     "id": "bw10-45",
@@ -2266,8 +2266,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 622,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/45_hires.png",
+    "nationalPokedexNumber": 622,
     "evolvesTo": [
       "Golurk"
     ]
@@ -2325,8 +2325,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 623,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/46_hires.png",
+    "nationalPokedexNumber": 623
   },
   {
     "id": "bw10-47",
@@ -2367,8 +2367,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/47_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -2423,8 +2423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/48_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2476,8 +2476,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/49_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "bw10-50",
@@ -2532,8 +2532,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/50_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "bw10-51",
@@ -2564,7 +2564,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -2585,8 +2585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 538,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/51_hires.png",
+    "nationalPokedexNumber": 538
   },
   {
     "id": "bw10-52",
@@ -2635,8 +2635,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 539,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/52_hires.png",
+    "nationalPokedexNumber": 539
   },
   {
     "id": "bw10-53",
@@ -2683,8 +2683,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 566,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/53_hires.png",
+    "nationalPokedexNumber": 566,
     "evolvesTo": [
       "Archeops"
     ]
@@ -2733,8 +2733,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 567,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/54_hires.png",
+    "nationalPokedexNumber": 567
   },
   {
     "id": "bw10-55",
@@ -2788,8 +2788,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/55_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -2849,8 +2849,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/56_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "bw10-57",
@@ -2879,7 +2879,7 @@
           "Metal"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage times the number of heads."
       },
       {
@@ -2906,8 +2906,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/57_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2953,7 +2953,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip a coin until you get tails. This attack does 50 damage times the number of heads."
       }
     ],
@@ -2969,8 +2969,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/58_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -3034,8 +3034,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/59_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "bw10-60",
@@ -3089,8 +3089,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/60_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "bw10-61",
@@ -3149,8 +3149,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 589,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/61_hires.png",
+    "nationalPokedexNumber": 589
   },
   {
     "id": "bw10-62",
@@ -3198,8 +3198,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/62_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -3254,8 +3254,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/63_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -3308,8 +3308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/64_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "bw10-65",
@@ -3365,8 +3365,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/65_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "bw10-66",
@@ -3422,8 +3422,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/66_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "bw10-67",
@@ -3471,8 +3471,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 610,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/67_hires.png",
+    "nationalPokedexNumber": 610,
     "evolvesTo": [
       "Fraxure"
     ]
@@ -3525,8 +3525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 611,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/68_hires.png",
+    "nationalPokedexNumber": 611,
     "evolvesTo": [
       "Haxorus"
     ]
@@ -3559,7 +3559,7 @@
           "Metal"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Does 40 damage times the amount of Metal Energy attached to this Pokémon."
       },
       {
@@ -3579,8 +3579,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 612,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/69_hires.png",
+    "nationalPokedexNumber": 612
   },
   {
     "id": "bw10-70",
@@ -3629,8 +3629,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/70_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "bw10-71",
@@ -3669,7 +3669,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3679,8 +3679,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/71_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "bw10-72",
@@ -3718,8 +3718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/72_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -3762,8 +3762,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/73_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -3802,7 +3802,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 3 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -3812,8 +3812,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 474,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/74_hires.png",
+    "nationalPokedexNumber": 474
   },
   {
     "id": "bw10-75",
@@ -3843,7 +3843,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3853,8 +3853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/75_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -3912,8 +3912,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/76_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "bw10-77",
@@ -3967,8 +3967,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/77_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "bw10-78",
@@ -4327,8 +4327,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/96_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw10-97",
@@ -4376,8 +4376,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/97_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "bw10-98",
@@ -4431,8 +4431,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/98_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "bw10-99",
@@ -4488,8 +4488,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/99_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "bw10-100",
@@ -4545,8 +4545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/100_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "bw10-101",
@@ -4613,8 +4613,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw10/102_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -4671,8 +4671,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 640,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/103_hires.png",
+    "nationalPokedexNumber": 640
   },
   {
     "id": "bw10-104",
@@ -4721,8 +4721,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw10/104_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "bw10-105",
diff --git a/json/cards/Plasma Freeze.json b/json/cards/Plasma Freeze.json
index 2486ad410..e6246d144 100644
--- a/json/cards/Plasma Freeze.json	
+++ b/json/cards/Plasma Freeze.json	
@@ -25,7 +25,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -35,8 +35,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/1_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -79,8 +79,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/2_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -130,8 +130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/3_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "bw9-4",
@@ -181,8 +181,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/4_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -242,8 +242,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/5_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "bw9-6",
@@ -297,8 +297,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/6_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -356,8 +356,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/7_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -418,8 +418,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/8_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "bw9-9",
@@ -464,8 +464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/9_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -523,8 +523,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/10_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "bw9-11",
@@ -554,7 +554,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to all of your opponent's Pokémon."
       },
       {
@@ -581,8 +581,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/11_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "bw9-12",
@@ -634,8 +634,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/12_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "bw9-13",
@@ -692,8 +692,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/13_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "bw9-14",
@@ -741,8 +741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/14_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -796,8 +796,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 608,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/15_hires.png",
+    "nationalPokedexNumber": 608,
     "evolvesTo": [
       "Chandelure"
     ]
@@ -847,8 +847,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 609,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/16_hires.png",
+    "nationalPokedexNumber": 609
   },
   {
     "id": "bw9-17",
@@ -901,8 +901,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/17_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "bw9-18",
@@ -930,7 +930,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -940,8 +940,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/18_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -983,8 +983,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/19_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -1037,8 +1037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/20_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "bw9-21",
@@ -1068,7 +1068,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -1078,8 +1078,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/21_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -1130,8 +1130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/22_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "bw9-23",
@@ -1178,8 +1178,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/23_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "bw9-24",
@@ -1217,8 +1217,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 535,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/24_hires.png",
+    "nationalPokedexNumber": 535,
     "evolvesTo": [
       "Palpitoad"
     ]
@@ -1273,8 +1273,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 536,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/25_hires.png",
+    "nationalPokedexNumber": 536,
     "evolvesTo": [
       "Seismitoad"
     ]
@@ -1331,8 +1331,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 537,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/26_hires.png",
+    "nationalPokedexNumber": 537
   },
   {
     "id": "bw9-27",
@@ -1371,8 +1371,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 582,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/27_hires.png",
+    "nationalPokedexNumber": 582,
     "evolvesTo": [
       "Vanillish"
     ]
@@ -1415,8 +1415,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 583,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/28_hires.png",
+    "nationalPokedexNumber": 583,
     "evolvesTo": [
       "Vanilluxe"
     ]
@@ -1448,7 +1448,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip a coin for each Energy attached to this Pokémon. This attack does 60 damage times the number of heads."
       },
       {
@@ -1468,8 +1468,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 584,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/29_hires.png",
+    "nationalPokedexNumber": 584
   },
   {
     "id": "bw9-30",
@@ -1516,8 +1516,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 615,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/30_hires.png",
+    "nationalPokedexNumber": 615
   },
   {
     "id": "bw9-31",
@@ -1569,8 +1569,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/31_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw9-32",
@@ -1609,8 +1609,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/32_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -1659,8 +1659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/33_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "bw9-34",
@@ -1689,7 +1689,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -1709,8 +1709,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/34_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "bw9-35",
@@ -1750,8 +1750,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/35_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -1805,8 +1805,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/36_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "bw9-37",
@@ -1853,8 +1853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/37_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "bw9-38",
@@ -1907,8 +1907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/38_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bw9-39",
@@ -1961,8 +1961,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/39_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "bw9-40",
@@ -2001,8 +2001,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/40_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -2048,7 +2048,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -2058,8 +2058,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/41_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -2115,8 +2115,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/42_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "bw9-43",
@@ -2154,8 +2154,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/43_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -2190,7 +2190,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -2211,8 +2211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/44_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2265,8 +2265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/45_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -2324,8 +2324,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/46_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "bw9-47",
@@ -2369,8 +2369,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/47_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "bw9-48",
@@ -2418,8 +2418,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/48_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "bw9-49",
@@ -2461,8 +2461,8 @@
         "text": "The Defending Pokémon can't retreat during your opponent's next turn."
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/49_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "bw9-50",
@@ -2510,8 +2510,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/50_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2565,8 +2565,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/51_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -2617,8 +2617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/52_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "bw9-53",
@@ -2666,8 +2666,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/53_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "bw9-54",
@@ -2706,8 +2706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 562,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/54_hires.png",
+    "nationalPokedexNumber": 562,
     "evolvesTo": [
       "Cofagrigus"
     ]
@@ -2759,8 +2759,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 562,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/55_hires.png",
+    "nationalPokedexNumber": 562,
     "evolvesTo": [
       "Cofagrigus"
     ]
@@ -2810,8 +2810,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 563,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/56_hires.png",
+    "nationalPokedexNumber": 563
   },
   {
     "id": "bw9-57",
@@ -2852,7 +2852,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 4 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -2862,8 +2862,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 563,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/57_hires.png",
+    "nationalPokedexNumber": 563
   },
   {
     "id": "bw9-58",
@@ -2923,8 +2923,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/58_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "bw9-59",
@@ -2962,8 +2962,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/59_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -2996,7 +2996,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -3016,8 +3016,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/60_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "bw9-61",
@@ -3061,7 +3061,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip 2 coins. This attack does 60 damage times the number of heads."
       }
     ],
@@ -3071,8 +3071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/61_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3106,7 +3106,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       },
       {
@@ -3127,8 +3127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/62_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3184,8 +3184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/63_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "bw9-64",
@@ -3237,8 +3237,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/64_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "bw9-65",
@@ -3283,8 +3283,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/65_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -3326,7 +3326,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard as many Pokémon as you like from your hand. This attack does 30 damage times the number of Pokémon you discarded."
       }
     ],
@@ -3342,8 +3342,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/66_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "bw9-67",
@@ -3399,8 +3399,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/67_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "bw9-68",
@@ -3446,8 +3446,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/68_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -3507,8 +3507,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/69_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -3569,8 +3569,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/70_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "bw9-71",
@@ -3614,8 +3614,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/71_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -3663,8 +3663,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/72_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -3723,8 +3723,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/73_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "bw9-74",
@@ -3781,8 +3781,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/74_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "bw9-75",
@@ -3839,8 +3839,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/75_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -3873,7 +3873,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3889,8 +3889,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/76_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -3951,8 +3951,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/77_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -4016,8 +4016,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/78_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "bw9-79",
@@ -4080,8 +4080,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/79_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "bw9-80",
@@ -4136,8 +4136,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/80_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "bw9-81",
@@ -4185,8 +4185,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/81_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -4239,8 +4239,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/82_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -4298,8 +4298,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/83_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "bw9-84",
@@ -4328,7 +4328,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Water Energy cards and Lightning Energy cards in your discard pile. Then, shuffle all of those cards back into your deck."
       },
       {
@@ -4347,8 +4347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/84_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "bw9-85",
@@ -4396,8 +4396,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/85_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "bw9-86",
@@ -4451,8 +4451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/86_hires.png",
+    "nationalPokedexNumber": 381,
     "evolvesTo": "M Latios-EX"
   },
   {
@@ -4492,8 +4492,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/87_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4542,8 +4542,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/88_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "bw9-89",
@@ -4591,8 +4591,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/89_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4651,8 +4651,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/90_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4706,8 +4706,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/91_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -4740,7 +4740,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of cards in your opponent's hand."
       },
       {
@@ -4767,8 +4767,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/92_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "bw9-93",
@@ -4819,8 +4819,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/93_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "bw9-94",
@@ -4863,8 +4863,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 352,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/94_hires.png",
+    "nationalPokedexNumber": 352
   },
   {
     "id": "bw9-95",
@@ -4908,8 +4908,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/95_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -4958,8 +4958,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/96_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -5021,8 +5021,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 398,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/97_hires.png",
+    "nationalPokedexNumber": 398
   },
   {
     "id": "bw9-98",
@@ -5082,8 +5082,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/98_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bw9-99",
@@ -5310,8 +5310,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/109_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "bw9-110",
@@ -5364,8 +5364,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/110_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "bw9-111",
@@ -5413,8 +5413,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/111_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "bw9-112",
@@ -5462,8 +5462,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/112_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "bw9-113",
@@ -5517,8 +5517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw9/113_hires.png",
+    "nationalPokedexNumber": 381,
     "evolvesTo": "M Latios-EX"
   },
   {
@@ -5579,8 +5579,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 641,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/114_hires.png",
+    "nationalPokedexNumber": 641
   },
   {
     "id": "bw9-115",
@@ -5649,7 +5649,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play (both yours and your opponent's)."
       }
     ],
@@ -5659,8 +5659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/117_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/117_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "bw9-118",
@@ -5705,8 +5705,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 561,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/118_hires.png",
+    "nationalPokedexNumber": 561
   },
   {
     "id": "bw9-119",
@@ -5754,8 +5754,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/119_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/119_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "bw9-120",
@@ -5804,8 +5804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw9/120_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "bw9-121",
diff --git a/json/cards/Plasma Storm.json b/json/cards/Plasma Storm.json
index 67571f644..c7ac576af 100644
--- a/json/cards/Plasma Storm.json	
+++ b/json/cards/Plasma Storm.json	
@@ -53,8 +53,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/1_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -106,8 +106,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 388,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/2_hires.png",
+    "nationalPokedexNumber": 388,
     "evolvesTo": [
       "Torterra"
     ]
@@ -172,8 +172,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/3_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "bw8-4",
@@ -211,8 +211,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/4_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -254,7 +254,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of damage counters on the Defending Pokémon."
       }
     ],
@@ -264,8 +264,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/5_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "bw8-6",
@@ -309,8 +309,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/6_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -364,8 +364,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/7_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "bw8-8",
@@ -403,8 +403,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 540,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/8_hires.png",
+    "nationalPokedexNumber": 540,
     "evolvesTo": [
       "Swadloon"
     ]
@@ -457,8 +457,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 541,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/9_hires.png",
+    "nationalPokedexNumber": 541,
     "evolvesTo": [
       "Leavanny"
     ]
@@ -513,8 +513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 542,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/10_hires.png",
+    "nationalPokedexNumber": 542
   },
   {
     "id": "bw8-11",
@@ -568,8 +568,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 556,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/11_hires.png",
+    "nationalPokedexNumber": 556
   },
   {
     "id": "bw8-12",
@@ -613,8 +613,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 590,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/12_hires.png",
+    "nationalPokedexNumber": 590,
     "evolvesTo": [
       "Amoonguss"
     ]
@@ -673,8 +673,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 591,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/13_hires.png",
+    "nationalPokedexNumber": 591
   },
   {
     "id": "bw8-14",
@@ -734,8 +734,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/14_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "bw8-15",
@@ -773,8 +773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/15_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -826,8 +826,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 391,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/16_hires.png",
+    "nationalPokedexNumber": 391,
     "evolvesTo": [
       "Infernape"
     ]
@@ -876,8 +876,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/17_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "bw8-18",
@@ -929,8 +929,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/18_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw8-19",
@@ -970,7 +970,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -980,8 +980,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/19_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -1035,8 +1035,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/20_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "bw8-21",
@@ -1074,8 +1074,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/21_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -1123,8 +1123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 608,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/22_hires.png",
+    "nationalPokedexNumber": 608,
     "evolvesTo": [
       "Chandelure"
     ]
@@ -1167,7 +1167,7 @@
           "Fire"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard the top 4 cards of your deck. This attack does 50 damage times the number of Fire Energy cards you discarded."
       }
     ],
@@ -1177,8 +1177,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 631,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/23_hires.png",
+    "nationalPokedexNumber": 631
   },
   {
     "id": "bw8-24",
@@ -1216,8 +1216,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/24_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -1281,8 +1281,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/25_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "bw8-26",
@@ -1312,7 +1312,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -1322,8 +1322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/26_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -1370,7 +1370,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 5 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -1380,8 +1380,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/27_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -1430,7 +1430,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "90x",
+        "damage": "90×",
         "text": "Flip a coin until you get tails. This attack does 90 damage times the number of heads."
       }
     ],
@@ -1440,8 +1440,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 473,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/28_hires.png",
+    "nationalPokedexNumber": 473
   },
   {
     "id": "bw8-29",
@@ -1480,8 +1480,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/29_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -1536,8 +1536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/30_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -1588,8 +1588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/31_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "bw8-32",
@@ -1628,8 +1628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/32_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -1674,8 +1674,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/33_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "bw8-34",
@@ -1718,8 +1718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/34_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "bw8-35",
@@ -1757,8 +1757,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 582,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/35_hires.png",
+    "nationalPokedexNumber": 582,
     "evolvesTo": [
       "Vanillish"
     ]
@@ -1801,8 +1801,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 583,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/36_hires.png",
+    "nationalPokedexNumber": 583,
     "evolvesTo": [
       "Vanilluxe"
     ]
@@ -1855,8 +1855,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 584,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/37_hires.png",
+    "nationalPokedexNumber": 584
   },
   {
     "id": "bw8-38",
@@ -1896,8 +1896,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 592,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/38_hires.png",
+    "nationalPokedexNumber": 592,
     "evolvesTo": [
       "Jellicent"
     ]
@@ -1946,8 +1946,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 593,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/39_hires.png",
+    "nationalPokedexNumber": 593
   },
   {
     "id": "bw8-40",
@@ -1997,8 +1997,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 613,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/40_hires.png",
+    "nationalPokedexNumber": 613,
     "evolvesTo": [
       "Beartic"
     ]
@@ -2034,7 +2034,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of damage counters on this Pokémon."
       },
       {
@@ -2055,8 +2055,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 614,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/41_hires.png",
+    "nationalPokedexNumber": 614
   },
   {
     "id": "bw8-42",
@@ -2104,8 +2104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/42_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2146,8 +2146,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/43_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2200,8 +2200,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/44_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2245,8 +2245,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/45_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2297,8 +2297,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/46_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "bw8-47",
@@ -2349,8 +2349,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/47_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "bw8-48",
@@ -2410,8 +2410,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/48_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "bw8-49",
@@ -2449,7 +2449,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Your opponent reveals his or her hand. This attack does 20 damage times the number of Trainer cards in your opponent's hand."
       }
     ],
@@ -2459,8 +2459,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/49_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "bw8-50",
@@ -2498,8 +2498,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/50_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -2528,7 +2528,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard all Lightning Energy attached to this Pokémon. This attack does 30 damage times the number of Energy cards you discarded."
       },
       {
@@ -2548,8 +2548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 596,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/51_hires.png",
+    "nationalPokedexNumber": 596
   },
   {
     "id": "bw8-52",
@@ -2593,8 +2593,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/52_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -2647,8 +2647,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/53_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -2697,8 +2697,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/54_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -2750,8 +2750,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/55_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "bw8-56",
@@ -2790,7 +2790,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2800,8 +2800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/56_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -2843,8 +2843,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/57_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -2893,8 +2893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/58_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "bw8-59",
@@ -2932,8 +2932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/59_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -2975,8 +2975,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/60_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -3011,7 +3011,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to all of your Pokémon."
       },
       {
@@ -3032,8 +3032,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/61_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "bw8-62",
@@ -3087,8 +3087,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/62_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "bw8-63",
@@ -3136,8 +3136,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/63_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -3189,8 +3189,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/64_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -3223,7 +3223,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage for each Pokémon Tool card attached to Pokémon in play (both yours and your opponent's)."
       }
     ],
@@ -3233,8 +3233,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 568,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/65_hires.png",
+    "nationalPokedexNumber": 568,
     "evolvesTo": [
       "Garbodor"
     ]
@@ -3289,8 +3289,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/66_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "bw8-67",
@@ -3322,7 +3322,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Colorless in the Defending Pokémon's Retreat Cost."
       },
       {
@@ -3334,7 +3334,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "80x",
+        "damage": "80×",
         "text": "Flip 2 coins. This attack does 80 damage times the number of heads."
       }
     ],
@@ -3344,8 +3344,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 569,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/67_hires.png",
+    "nationalPokedexNumber": 569
   },
   {
     "id": "bw8-68",
@@ -3384,8 +3384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/68_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -3436,8 +3436,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 605,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/69_hires.png",
+    "nationalPokedexNumber": 605,
     "evolvesTo": [
       "Beheeyem"
     ]
@@ -3490,8 +3490,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 606,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/70_hires.png",
+    "nationalPokedexNumber": 606
   },
   {
     "id": "bw8-71",
@@ -3547,8 +3547,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/71_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3611,8 +3611,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/72_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "bw8-73",
@@ -3658,8 +3658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/73_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "bw8-74",
@@ -3711,8 +3711,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/74_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "bw8-75",
@@ -3760,8 +3760,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/75_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -3814,8 +3814,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/76_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -3869,8 +3869,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/77_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "bw8-78",
@@ -3917,8 +3917,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/78_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "bw8-79",
@@ -3969,8 +3969,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 532,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/79_hires.png",
+    "nationalPokedexNumber": 532,
     "evolvesTo": [
       "Gurdurr"
     ]
@@ -4028,8 +4028,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 533,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/80_hires.png",
+    "nationalPokedexNumber": 533,
     "evolvesTo": [
       "Conkeldurr"
     ]
@@ -4087,8 +4087,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 534,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/81_hires.png",
+    "nationalPokedexNumber": 534
   },
   {
     "id": "bw8-82",
@@ -4126,7 +4126,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4142,8 +4142,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/82_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -4200,8 +4200,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 509,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/83_hires.png",
+    "nationalPokedexNumber": 509,
     "evolvesTo": [
       "Liepard"
     ]
@@ -4259,8 +4259,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 510,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/84_hires.png",
+    "nationalPokedexNumber": 510
   },
   {
     "id": "bw8-85",
@@ -4315,8 +4315,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 559,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/85_hires.png",
+    "nationalPokedexNumber": 559,
     "evolvesTo": [
       "Scrafty"
     ]
@@ -4376,8 +4376,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 560,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/86_hires.png",
+    "nationalPokedexNumber": 560
   },
   {
     "id": "bw8-87",
@@ -4432,8 +4432,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/87_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "bw8-88",
@@ -4488,8 +4488,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 599,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/88_hires.png",
+    "nationalPokedexNumber": 599,
     "evolvesTo": [
       "Klang"
     ]
@@ -4549,8 +4549,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 600,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/89_hires.png",
+    "nationalPokedexNumber": 600,
     "evolvesTo": [
       "Klinklang"
     ]
@@ -4607,8 +4607,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 601,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/90_hires.png",
+    "nationalPokedexNumber": 601
   },
   {
     "id": "bw8-91",
@@ -4664,8 +4664,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 632,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/91_hires.png",
+    "nationalPokedexNumber": 632
   },
   {
     "id": "bw8-92",
@@ -4719,8 +4719,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 632,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/92_hires.png",
+    "nationalPokedexNumber": 632
   },
   {
     "id": "bw8-93",
@@ -4779,8 +4779,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/93_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bw8-94",
@@ -4831,8 +4831,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/94_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "bw8-95",
@@ -4889,8 +4889,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/95_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw8-96",
@@ -4947,8 +4947,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/96_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "bw8-97",
@@ -4986,7 +4986,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4996,8 +4996,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/97_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -5046,8 +5046,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/98_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "bw8-99",
@@ -5076,7 +5076,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 5 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -5092,8 +5092,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/99_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -5125,7 +5125,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads. This Pokémon is now Confused."
       },
       {
@@ -5152,8 +5152,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/100_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "bw8-101",
@@ -5193,7 +5193,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 5,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of Team Plasma Pokémon you have in play."
       }
     ],
@@ -5203,8 +5203,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/101_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "bw8-102",
@@ -5242,8 +5242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/102_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -5291,8 +5291,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/103_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -5345,8 +5345,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/104_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "bw8-105",
@@ -5396,8 +5396,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/105_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -5452,8 +5452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/106_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -5502,7 +5502,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Does 50 damage times the number of your Pokémon that have the Round attack."
       }
     ],
@@ -5512,8 +5512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/107_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "bw8-108",
@@ -5569,8 +5569,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/108_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "bw8-109",
@@ -5599,7 +5599,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -5609,8 +5609,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/109_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -5651,8 +5651,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/110_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -5693,7 +5693,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -5703,8 +5703,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 504,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/111_hires.png",
+    "nationalPokedexNumber": 504,
     "evolvesTo": [
       "Watchog"
     ]
@@ -5756,8 +5756,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 505,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/112_hires.png",
+    "nationalPokedexNumber": 505
   },
   {
     "id": "bw8-113",
@@ -5808,8 +5808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 505,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/113_hires.png",
+    "nationalPokedexNumber": 505
   },
   {
     "id": "bw8-114",
@@ -5860,8 +5860,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 626,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/114_hires.png",
+    "nationalPokedexNumber": 626
   },
   {
     "id": "bw8-115",
@@ -5906,8 +5906,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 627,
     "imageUrlHiRes": "https://images.pokemontcg.io/bw8/115_hires.png",
+    "nationalPokedexNumber": 627,
     "evolvesTo": [
       "Braviary"
     ]
@@ -5963,8 +5963,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 628,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/116_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/116_hires.png",
+    "nationalPokedexNumber": 628
   },
   {
     "id": "bw8-117",
@@ -6254,8 +6254,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/131_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/131_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "bw8-132",
@@ -6316,8 +6316,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/132_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/132_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "bw8-133",
@@ -6376,8 +6376,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/133_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/133_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "bw8-134",
@@ -6433,8 +6433,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/134_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/134_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "bw8-135",
@@ -6490,7 +6490,7 @@
       {
         "name": "Scorching Fire",
         "cost": [
-          "Fighting",
+          "Fire",
           "Colorless",
           "Colorless",
           "Colorless",
@@ -6507,8 +6507,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/136_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/136_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "bw8-137",
@@ -6519,7 +6519,7 @@
     "evolvesFrom": "Wartortle",
     "ability": {
       "name": "Deluge",
-      "text": "As often as you like during your turn (before your attack), you may attach a { Water } Energy card from your hand to 1 of your Pokémon.",
+      "text": "As often as you like during your turn (before your attack), you may attach a Water Energy card from your hand to 1 of your Pokémon.",
       "type": "Ability"
     },
     "hp": "140",
@@ -6558,8 +6558,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/137_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/bw8/137_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "bw8-138",
diff --git a/json/cards/Platinum.json b/json/cards/Platinum.json
index d17c92b04..6859e059b 100644
--- a/json/cards/Platinum.json
+++ b/json/cards/Platinum.json
@@ -61,8 +61,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "pl1-2",
@@ -121,8 +121,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/2_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "pl1-3",
@@ -179,8 +179,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/3_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "pl1-4",
@@ -236,8 +236,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/4_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "pl1-5",
@@ -291,8 +291,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/5_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "pl1-6",
@@ -346,8 +346,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/6_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "pl1-7",
@@ -405,8 +405,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/7_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "pl1-8",
@@ -462,8 +462,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/8_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "pl1-9",
@@ -517,8 +517,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/9_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "pl1-10",
@@ -587,8 +587,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/10_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "pl1-11",
@@ -646,8 +646,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/11_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "pl1-12",
@@ -699,8 +699,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/12_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "pl1-13",
@@ -755,8 +755,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 409,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/13_hires.png",
+    "nationalPokedexNumber": 409
   },
   {
     "id": "pl1-14",
@@ -811,8 +811,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/14_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "pl1-15",
@@ -867,8 +867,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/15_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "pl1-16",
@@ -919,8 +919,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/16_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "pl1-17",
@@ -973,8 +973,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/17_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "pl1-18",
@@ -1040,8 +1040,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/18_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "pl1-19",
@@ -1102,8 +1102,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/19_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "pl1-20",
@@ -1171,8 +1171,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 411,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/20_hires.png",
+    "nationalPokedexNumber": 411
   },
   {
     "id": "pl1-21",
@@ -1224,8 +1224,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/21_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "pl1-22",
@@ -1283,8 +1283,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/22_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "pl1-23",
@@ -1344,8 +1344,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/23_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "pl1-24",
@@ -1405,8 +1405,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/24_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "pl1-25",
@@ -1460,8 +1460,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/25_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "pl1-26",
@@ -1514,8 +1514,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/26_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "pl1-27",
@@ -1574,8 +1574,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/27_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "pl1-28",
@@ -1633,8 +1633,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/28_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "pl1-29",
@@ -1681,8 +1681,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/29_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "pl1-30",
@@ -1737,8 +1737,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/30_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "pl1-31",
@@ -1785,8 +1785,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/31_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "pl1-32",
@@ -1837,8 +1837,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 402,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/32_hires.png",
+    "nationalPokedexNumber": 402
   },
   {
     "id": "pl1-33",
@@ -1895,8 +1895,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 463,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/33_hires.png",
+    "nationalPokedexNumber": 463
   },
   {
     "id": "pl1-34",
@@ -1954,8 +1954,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/34_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "pl1-35",
@@ -2003,8 +2003,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 370,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/35_hires.png",
+    "nationalPokedexNumber": 370
   },
   {
     "id": "pl1-36",
@@ -2051,8 +2051,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/36_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "pl1-37",
@@ -2104,8 +2104,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/37_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "pl1-38",
@@ -2161,8 +2161,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/38_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "pl1-39",
@@ -2219,8 +2219,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/39_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "pl1-40",
@@ -2266,8 +2266,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/40_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "pl1-41",
@@ -2321,8 +2321,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/41_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "pl1-42",
@@ -2374,8 +2374,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/42_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "pl1-43",
@@ -2441,8 +2441,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/43_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "pl1-44",
@@ -2493,8 +2493,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 268,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/44_hires.png",
+    "nationalPokedexNumber": 268,
     "evolvesTo": [
       "Dustox"
     ]
@@ -2549,8 +2549,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/45_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -2603,8 +2603,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 408,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/46_hires.png",
+    "nationalPokedexNumber": 408,
     "evolvesTo": [
       "Rampardos"
     ]
@@ -2655,8 +2655,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/47_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "pl1-48",
@@ -2712,8 +2712,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/48_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -2776,8 +2776,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 388,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/49_hires.png",
+    "nationalPokedexNumber": 388,
     "evolvesTo": [
       "Torterra"
     ]
@@ -2837,8 +2837,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/50_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "pl1-51",
@@ -2890,8 +2890,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/51_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -2947,8 +2947,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/52_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -2998,8 +2998,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/53_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "pl1-54",
@@ -3059,8 +3059,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/54_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "pl1-55",
@@ -3117,8 +3117,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/55_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "pl1-56",
@@ -3165,8 +3165,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 391,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/56_hires.png",
+    "nationalPokedexNumber": 391,
     "evolvesTo": [
       "Infernape"
     ]
@@ -3228,8 +3228,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/57_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "pl1-58",
@@ -3280,8 +3280,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/58_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "pl1-59",
@@ -3332,8 +3332,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 394,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/59_hires.png",
+    "nationalPokedexNumber": 394,
     "evolvesTo": [
       "Empoleon"
     ]
@@ -3390,8 +3390,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/60_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "pl1-61",
@@ -3450,8 +3450,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/61_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "pl1-62",
@@ -3507,8 +3507,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 410,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/62_hires.png",
+    "nationalPokedexNumber": 410,
     "evolvesTo": [
       "Bastiodon"
     ]
@@ -3562,8 +3562,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 266,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/63_hires.png",
+    "nationalPokedexNumber": 266,
     "evolvesTo": [
       "Beautifly"
     ]
@@ -3617,8 +3617,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/64_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -3671,8 +3671,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/65_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -3730,8 +3730,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/66_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "pl1-67",
@@ -3785,8 +3785,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/67_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -3845,8 +3845,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/68_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "pl1-69",
@@ -3896,8 +3896,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/69_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -3949,8 +3949,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/70_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -4008,8 +4008,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/71_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -4067,8 +4067,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/72_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -4119,8 +4119,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/73_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "pl1-74",
@@ -4172,8 +4172,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/74_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -4225,8 +4225,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/75_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -4273,8 +4273,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 440,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/76_hires.png",
+    "nationalPokedexNumber": 440,
     "evolvesTo": [
       "Chansey"
     ]
@@ -4332,8 +4332,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/77_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "pl1-78",
@@ -4382,8 +4382,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 401,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/78_hires.png",
+    "nationalPokedexNumber": 401,
     "evolvesTo": [
       "Kricketune"
     ]
@@ -4437,8 +4437,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/79_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "pl1-80",
@@ -4490,8 +4490,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/80_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -4542,8 +4542,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/81_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -4600,8 +4600,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/82_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -4658,8 +4658,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/83_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -4711,8 +4711,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/84_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -4764,8 +4764,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/85_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -4822,8 +4822,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/86_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -4875,8 +4875,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/87_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -4932,8 +4932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 432,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/88_hires.png",
+    "nationalPokedexNumber": 432
   },
   {
     "id": "pl1-89",
@@ -4981,8 +4981,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/89_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -5034,8 +5034,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/90_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -5087,8 +5087,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 447,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/91_hires.png",
+    "nationalPokedexNumber": 447,
     "evolvesTo": [
       "Lucario"
     ]
@@ -5145,8 +5145,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/92_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -5197,8 +5197,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/93_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -5247,8 +5247,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 435,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/94_hires.png",
+    "nationalPokedexNumber": 435
   },
   {
     "id": "pl1-95",
@@ -5297,8 +5297,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/95_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -5350,8 +5350,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/96_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -5405,8 +5405,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/97_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -5457,8 +5457,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/98_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "pl1-99",
@@ -5506,8 +5506,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/99_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -5561,8 +5561,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/100_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "pl1-101",
@@ -5618,8 +5618,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/101_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -5671,8 +5671,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/102_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -5724,8 +5724,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/103_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -6115,8 +6115,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/122_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/122_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "pl1-123",
@@ -6168,8 +6168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/123_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/123_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "pl1-124",
@@ -6227,8 +6227,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/124_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/124_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "pl1-125",
@@ -6279,8 +6279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/125_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/125_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "pl1-126",
@@ -6335,8 +6335,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/126_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/126_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "pl1-127",
@@ -6387,8 +6387,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/127_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/127_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "pl1-128",
@@ -6438,8 +6438,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/128_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -6493,8 +6493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/129_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl1/129_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "pl1-130",
@@ -6547,8 +6547,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/130_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -6605,8 +6605,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/SH4_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -6672,8 +6672,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/SH5_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -6734,8 +6734,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl1/SH6_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
diff --git a/json/cards/Power Keepers.json b/json/cards/Power Keepers.json
index 2bfd5d850..c9ca39f67 100644
--- a/json/cards/Power Keepers.json	
+++ b/json/cards/Power Keepers.json	
@@ -64,8 +64,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/1_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "ex16-2",
@@ -131,8 +131,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/2_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "ex16-3",
@@ -184,8 +184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/3_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "ex16-4",
@@ -226,7 +226,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Your opponent flips a number of coins equal to the number of his or her Benched Pokémon. This attack does 40 damage times the number of tails. This attack's damage isn't affected by Weakness or Resistance."
       }
     ],
@@ -242,8 +242,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/4_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "ex16-5",
@@ -290,8 +290,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/5_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex16-6",
@@ -343,8 +343,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/6_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ex16-7",
@@ -391,8 +391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/7_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "ex16-8",
@@ -404,7 +404,7 @@
     "ability": {
       "name": "Energy Draw",
       "text": "Once during your turn (before your attack), you may discard 1 Energy card from your hand. Then draw up to 3 cards from your deck. This power can't be used if Delcatty is affected by a Special Condition.",
-      "type": "Poké-Body"
+      "type": "Poké-Power"
     },
     "hp": "70",
     "retreatCost": [
@@ -426,7 +426,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to all of your Active Pokémon."
       }
     ],
@@ -436,8 +436,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/8_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "ex16-9",
@@ -472,7 +472,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the total amount of Energy attached to Gardevoir and the Defending Pokémon."
       }
     ],
@@ -482,8 +482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/9_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "ex16-10",
@@ -540,8 +540,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/10_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "ex16-11",
@@ -599,8 +599,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/11_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ex16-12",
@@ -650,8 +650,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/12_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex16-13",
@@ -663,7 +663,7 @@
     "ability": {
       "name": "Lazy",
       "text": "As long as Slaking is your Active Pokémon, your opponent's Pokémon can't use any Poké-Powers.",
-      "type": "Poké-Power"
+      "type": "Poké-Body"
     },
     "hp": "120",
     "retreatCost": [
@@ -700,8 +700,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/13_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "ex16-14",
@@ -759,8 +759,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/14_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -810,8 +810,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/15_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ex16-16",
@@ -846,7 +846,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to all of your Pokémon (including Magneton)."
       }
     ],
@@ -862,8 +862,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/16_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -920,8 +920,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/17_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "ex16-18",
@@ -975,8 +975,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/18_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex16-19",
@@ -1032,8 +1032,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/19_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "ex16-20",
@@ -1083,8 +1083,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/20_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "ex16-21",
@@ -1127,8 +1127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/21_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -1184,8 +1184,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/22_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "ex16-23",
@@ -1234,8 +1234,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/23_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "ex16-24",
@@ -1281,8 +1281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/24_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "ex16-25",
@@ -1335,8 +1335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/25_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "ex16-26",
@@ -1381,8 +1381,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/26_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -1421,7 +1421,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -1437,8 +1437,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/27_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "ex16-28",
@@ -1488,8 +1488,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/28_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1537,8 +1537,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/29_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1597,8 +1597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 362,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/30_hires.png",
+    "nationalPokedexNumber": 362
   },
   {
     "id": "ex16-31",
@@ -1647,8 +1647,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/31_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -1710,8 +1710,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/32_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -1764,8 +1764,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/33_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -1824,8 +1824,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/34_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "ex16-35",
@@ -1877,8 +1877,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/35_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -1937,8 +1937,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/36_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -1981,8 +1981,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/37_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -2039,8 +2039,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/38_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "ex16-39",
@@ -2102,8 +2102,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/39_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2167,8 +2167,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/40_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -2216,8 +2216,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/41_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -2275,8 +2275,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/42_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2307,7 +2307,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Bagon."
       }
     ],
@@ -2327,8 +2327,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/43_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2379,8 +2379,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/44_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -2428,8 +2428,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/45_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -2470,8 +2470,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/46_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -2524,8 +2524,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/47_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -2566,8 +2566,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/48_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -2618,8 +2618,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/49_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2667,8 +2667,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/50_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -2711,7 +2711,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2721,8 +2721,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/51_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -2777,8 +2777,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/52_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -2829,8 +2829,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/53_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -2887,8 +2887,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/54_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -2938,8 +2938,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/55_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -2991,8 +2991,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/56_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3033,7 +3033,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3043,8 +3043,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/57_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3075,7 +3075,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3091,8 +3091,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/58_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3143,8 +3143,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/59_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3185,7 +3185,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3195,8 +3195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/60_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3243,8 +3243,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/61_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -3295,8 +3295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/62_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -3346,8 +3346,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/63_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -3388,7 +3388,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3398,8 +3398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 361,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/64_hires.png",
+    "nationalPokedexNumber": 361,
     "evolvesTo": [
       "Glalie",
       "Froslass"
@@ -3451,8 +3451,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/65_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -3483,7 +3483,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3499,8 +3499,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/66_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -3541,8 +3541,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/67_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -3583,8 +3583,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/68_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -3635,8 +3635,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/69_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -3672,7 +3672,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Wynaut."
       }
     ],
@@ -3682,8 +3682,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 360,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex16/70_hires.png",
+    "nationalPokedexNumber": 360,
     "evolvesTo": [
       "Wobbuffet"
     ]
@@ -4123,8 +4123,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/92_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "ex16-93",
@@ -4185,8 +4185,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/93_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex16-94",
@@ -4243,8 +4243,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/94_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "ex16-95",
@@ -4303,8 +4303,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/95_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "ex16-96",
@@ -4373,8 +4373,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/96_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "ex16-97",
@@ -4434,8 +4434,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/97_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex16-98",
@@ -4500,8 +4500,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/98_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ex16-99",
@@ -4553,8 +4553,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/99_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "ex16-100",
@@ -4602,8 +4602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/100_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ex16-101",
@@ -4657,8 +4657,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/101_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ex16-102",
@@ -4706,8 +4706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex16/102_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ex16-103",
diff --git a/json/cards/Primal Clash.json b/json/cards/Primal Clash.json
index 4ea38ebe0..4e6322e09 100644
--- a/json/cards/Primal Clash.json	
+++ b/json/cards/Primal Clash.json	
@@ -35,8 +35,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/1_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -80,8 +80,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/2_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -120,7 +120,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 2,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -130,8 +130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/3_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "xy5-4",
@@ -182,8 +182,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/4_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -242,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/5_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "xy5-6",
@@ -281,8 +281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/6_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -335,8 +335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/7_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -386,8 +386,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/8_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "xy5-9",
@@ -442,8 +442,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/9_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "xy5-10",
@@ -482,8 +482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/10_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -536,8 +536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/11_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -587,8 +587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/12_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "xy5-13",
@@ -626,8 +626,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/13_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -679,8 +679,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/14_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "xy5-15",
@@ -718,8 +718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/15_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -774,8 +774,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/16_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "xy5-17",
@@ -823,8 +823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/17_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "xy5-18",
@@ -871,8 +871,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/18_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "xy5-19",
@@ -926,8 +926,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/19_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xy5-20",
@@ -974,8 +974,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 37,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/20_hires.png",
+    "nationalPokedexNumber": 37,
     "evolvesTo": [
       "Ninetales"
     ]
@@ -1024,8 +1024,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 38,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/21_hires.png",
+    "nationalPokedexNumber": 38
   },
   {
     "id": "xy5-22",
@@ -1076,8 +1076,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/22_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -1133,8 +1133,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/23_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "xy5-24",
@@ -1191,8 +1191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/24_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "xy5-25",
@@ -1230,8 +1230,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/25_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -1285,8 +1285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/26_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -1338,8 +1338,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/27_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1391,8 +1391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/28_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "xy5-29",
@@ -1439,7 +1439,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard as many Fire Energy attached to your Pokémon as you like. This attack does 50 damage times the number of Energy cards you discarded."
       }
     ],
@@ -1449,8 +1449,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/29_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "xy5-30",
@@ -1488,8 +1488,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/30_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -1541,8 +1541,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/31_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -1583,8 +1583,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/32_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -1635,8 +1635,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/33_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -1692,8 +1692,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/34_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -1751,8 +1751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/35_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "xy5-36",
@@ -1804,8 +1804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/36_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "xy5-37",
@@ -1860,8 +1860,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/37_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "xy5-38",
@@ -1914,8 +1914,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/38_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "xy5-39",
@@ -1955,8 +1955,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 339,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/39_hires.png",
+    "nationalPokedexNumber": 339,
     "evolvesTo": [
       "Whiscash"
     ]
@@ -2011,8 +2011,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/40_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "xy5-41",
@@ -2072,8 +2072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/41_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "xy5-42",
@@ -2121,8 +2121,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/42_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -2163,8 +2163,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/43_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -2214,8 +2214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/44_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "xy5-45",
@@ -2245,7 +2245,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2255,8 +2255,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/45_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -2299,8 +2299,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/46_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -2356,8 +2356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/47_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -2415,8 +2415,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/48_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "xy5-49",
@@ -2455,8 +2455,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 366,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/49_hires.png",
+    "nationalPokedexNumber": 366,
     "evolvesTo": [
       "Huntail",
       "Gorebyss"
@@ -2489,7 +2489,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the amount of Energy attached to all of your Pokémon."
       },
       {
@@ -2510,8 +2510,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 367,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/50_hires.png",
+    "nationalPokedexNumber": 367
   },
   {
     "id": "xy5-51",
@@ -2557,8 +2557,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 368,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/51_hires.png",
+    "nationalPokedexNumber": 368
   },
   {
     "id": "xy5-52",
@@ -2602,8 +2602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 368,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/52_hires.png",
+    "nationalPokedexNumber": 368
   },
   {
     "id": "xy5-53",
@@ -2635,7 +2635,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -2657,8 +2657,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/53_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xy5-54",
@@ -2715,8 +2715,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/54_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xy5-55",
@@ -2769,8 +2769,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/55_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xy5-56",
@@ -2817,8 +2817,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/56_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "xy5-57",
@@ -2864,8 +2864,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/57_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2926,8 +2926,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/58_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "xy5-59",
@@ -2981,8 +2981,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/59_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3033,8 +3033,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/60_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -3094,8 +3094,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/61_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "xy5-62",
@@ -3139,8 +3139,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 602,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/62_hires.png",
+    "nationalPokedexNumber": 602,
     "evolvesTo": [
       "Eelektrik"
     ]
@@ -3185,7 +3185,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 4 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -3201,8 +3201,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 603,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/63_hires.png",
+    "nationalPokedexNumber": 603,
     "evolvesTo": [
       "Eelektross"
     ]
@@ -3257,8 +3257,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 603,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/64_hires.png",
+    "nationalPokedexNumber": 603,
     "evolvesTo": [
       "Eelektross"
     ]
@@ -3316,8 +3316,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 604,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/65_hires.png",
+    "nationalPokedexNumber": 604
   },
   {
     "id": "xy5-66",
@@ -3365,8 +3365,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/66_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -3420,8 +3420,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/67_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -3456,7 +3456,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       },
       {
@@ -3477,8 +3477,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/68_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "xy5-69",
@@ -3533,8 +3533,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/69_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "xy5-70",
@@ -3572,8 +3572,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/70_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -3619,8 +3619,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 72,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/71_hires.png",
+    "nationalPokedexNumber": 72,
     "evolvesTo": [
       "Tentacruel"
     ]
@@ -3674,8 +3674,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 73,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/72_hires.png",
+    "nationalPokedexNumber": 73
   },
   {
     "id": "xy5-73",
@@ -3711,8 +3711,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/73_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "xy5-74",
@@ -3753,8 +3753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/74_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3813,8 +3813,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/75_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -3873,8 +3873,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/76_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "xy5-77",
@@ -3928,8 +3928,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/77_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "xy5-78",
@@ -3981,8 +3981,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/78_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -4023,8 +4023,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/79_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -4077,8 +4077,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/80_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "xy5-81",
@@ -4131,8 +4131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/81_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "xy5-82",
@@ -4180,8 +4180,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/82_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4232,8 +4232,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/83_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "xy5-84",
@@ -4287,8 +4287,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/84_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xy5-85",
@@ -4345,8 +4345,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/85_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xy5-86",
@@ -4399,8 +4399,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/86_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xy5-87",
@@ -4452,8 +4452,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/87_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -4512,8 +4512,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/88_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "xy5-89",
@@ -4542,7 +4542,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4552,8 +4552,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 529,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/89_hires.png",
+    "nationalPokedexNumber": 529,
     "evolvesTo": [
       "Excadrill"
     ]
@@ -4608,8 +4608,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 660,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/90_hires.png",
+    "nationalPokedexNumber": 660
   },
   {
     "id": "xy5-91",
@@ -4662,8 +4662,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/91_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "xy5-92",
@@ -4716,8 +4716,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/92_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "xy5-93",
@@ -4781,8 +4781,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/93_hires.png",
+    "nationalPokedexNumber": 306,
     "evolvesTo": "M Aggron-EX"
   },
   {
@@ -4838,8 +4838,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/94_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "xy5-95",
@@ -4870,7 +4870,7 @@
           "Metal"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -4897,8 +4897,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/95_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "xy5-96",
@@ -4955,8 +4955,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/96_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "xy5-97",
@@ -5018,8 +5018,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 530,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/97_hires.png",
+    "nationalPokedexNumber": 530
   },
   {
     "id": "xy5-98",
@@ -5064,8 +5064,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 679,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/98_hires.png",
+    "nationalPokedexNumber": 679,
     "evolvesTo": [
       "Doublade"
     ]
@@ -5126,8 +5126,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 680,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/99_hires.png",
+    "nationalPokedexNumber": 680,
     "evolvesTo": [
       "Aegislash"
     ]
@@ -5184,8 +5184,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 681,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/100_hires.png",
+    "nationalPokedexNumber": 681
   },
   {
     "id": "xy5-101",
@@ -5240,8 +5240,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/101_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "xy5-102",
@@ -5296,8 +5296,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/102_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -5358,8 +5358,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/103_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "xy5-104",
@@ -5394,7 +5394,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -5421,8 +5421,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/104_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "xy5-105",
@@ -5481,8 +5481,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/105_hires.png",
+    "nationalPokedexNumber": 282,
     "evolvesTo": "M Gardevoir-EX"
   },
   {
@@ -5491,6 +5491,7 @@
     "imageUrl": "https://images.pokemontcg.io/xy5/106.png",
     "subtype": "MEGA",
     "supertype": "Pokémon",
+    "evolvesFrom": "Gardevoir-EX",
     "hp": "210",
     "retreatCost": [
       "Colorless",
@@ -5518,7 +5519,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "This attack does 30 damage times the amount of Fairy Energy attached to all of your Pokémon."
       }
     ],
@@ -5534,9 +5535,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/106_hires.png",
-    "evolvesFrom": "Gardevoir-EX"
+    "nationalPokedexNumber": 282
   },
   {
     "id": "xy5-107",
@@ -5585,8 +5585,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/107_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "xy5-108",
@@ -5640,8 +5640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/108_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "xy5-109",
@@ -5691,8 +5691,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/109_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -5741,8 +5741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/110_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "xy5-111",
@@ -5790,8 +5790,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 263,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/111_hires.png",
+    "nationalPokedexNumber": 263,
     "evolvesTo": [
       "Linoone"
     ]
@@ -5824,7 +5824,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -5844,8 +5844,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 264,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/112_hires.png",
+    "nationalPokedexNumber": 264
   },
   {
     "id": "xy5-113",
@@ -5893,8 +5893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/113_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -5946,8 +5946,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/114_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "xy5-115",
@@ -5994,8 +5994,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/115_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "xy5-116",
@@ -6044,8 +6044,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/116_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -6092,8 +6092,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/117_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -6138,7 +6138,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "80x",
+        "damage": "80×",
         "text": "Flip a coin until you get tails. This attack does 80 damage times the number of heads."
       }
     ],
@@ -6148,8 +6148,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 400,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/118_hires.png",
+    "nationalPokedexNumber": 400
   },
   {
     "id": "xy5-119",
@@ -6195,8 +6195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 626,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/119_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/119_hires.png",
+    "nationalPokedexNumber": 626
   },
   {
     "id": "xy5-120",
@@ -6236,8 +6236,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 659,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/120_hires.png",
+    "nationalPokedexNumber": 659,
     "evolvesTo": [
       "Diggersby"
     ]
@@ -6292,8 +6292,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 659,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/121_hires.png",
+    "nationalPokedexNumber": 659,
     "evolvesTo": [
       "Diggersby"
     ]
@@ -6741,8 +6741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/145_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xy5-146",
@@ -6789,7 +6789,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard as many Fire Energy attached to your Pokémon as you like. This attack does 50 damage times the number of Energy cards you discarded."
       }
     ],
@@ -6799,8 +6799,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/146_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "xy5-147",
@@ -6853,8 +6853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/147_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/147_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "xy5-148",
@@ -6911,8 +6911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/148_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/148_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xy5-149",
@@ -6965,8 +6965,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/149_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/149_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xy5-150",
@@ -7023,8 +7023,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/150_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xy5-151",
@@ -7077,8 +7077,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/151_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/151_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xy5-152",
@@ -7131,8 +7131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/152_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/152_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "xy5-153",
@@ -7196,8 +7196,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/153_hires.png",
+    "nationalPokedexNumber": 306,
     "evolvesTo": "M Aggron-EX"
   },
   {
@@ -7253,8 +7253,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/154_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/154_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "xy5-155",
@@ -7313,8 +7313,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy5/155_hires.png",
+    "nationalPokedexNumber": 282,
     "evolvesTo": "M Gardevoir-EX"
   },
   {
@@ -7351,7 +7351,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "This attack does 30 damage times the amount of Fairy Energy attached to all of your Pokémon."
       }
     ],
@@ -7367,8 +7367,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/156_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy5/156_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "xy5-157",
diff --git a/json/cards/Rising Rivals.json b/json/cards/Rising Rivals.json
index eae373c75..79de83461 100644
--- a/json/cards/Rising Rivals.json	
+++ b/json/cards/Rising Rivals.json	
@@ -55,8 +55,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/1_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "pl2-2",
@@ -117,8 +117,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 411,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/2_hires.png",
+    "nationalPokedexNumber": 411
   },
   {
     "id": "pl2-3",
@@ -171,8 +171,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/3_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "pl2-4",
@@ -221,8 +221,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/4_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "pl2-5",
@@ -282,8 +282,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/5_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "pl2-6",
@@ -332,8 +332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 478,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/6_hires.png",
+    "nationalPokedexNumber": 478
   },
   {
     "id": "pl2-7",
@@ -389,8 +389,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/7_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "pl2-8",
@@ -401,7 +401,7 @@
     "level": "32",
     "ability": {
       "name": "Boundary Aura",
-      "text": "Apply Weakness for each Pokémon (both yours and your opponent's) as x2 instead.",
+      "text": "Apply Weakness for each Pokémon (both yours and your opponent's) as ×2 instead.",
       "type": "Poké-Body"
     },
     "hp": "80",
@@ -436,8 +436,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/8_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "pl2-9",
@@ -494,8 +494,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/9_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "pl2-10",
@@ -550,8 +550,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/10_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "pl2-11",
@@ -602,8 +602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 409,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/11_hires.png",
+    "nationalPokedexNumber": 409
   },
   {
     "id": "pl2-12",
@@ -652,8 +652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/12_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "pl2-13",
@@ -716,8 +716,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/13_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "pl2-14",
@@ -789,8 +789,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/14_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "pl2-15",
@@ -837,8 +837,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/15_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "pl2-16",
@@ -895,8 +895,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/16_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "pl2-17",
@@ -956,8 +956,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/17_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "pl2-18",
@@ -1006,8 +1006,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/18_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "pl2-19",
@@ -1062,8 +1062,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/19_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "pl2-20",
@@ -1114,8 +1114,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/20_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "pl2-21",
@@ -1176,8 +1176,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 423,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/21_hires.png",
+    "nationalPokedexNumber": 423
   },
   {
     "id": "pl2-22",
@@ -1250,8 +1250,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 423,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/22_hires.png",
+    "nationalPokedexNumber": 423
   },
   {
     "id": "pl2-23",
@@ -1313,8 +1313,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/23_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "pl2-24",
@@ -1364,8 +1364,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/24_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "pl2-25",
@@ -1431,8 +1431,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/25_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "pl2-26",
@@ -1490,8 +1490,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/26_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "pl2-27",
@@ -1547,8 +1547,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 473,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/27_hires.png",
+    "nationalPokedexNumber": 473
   },
   {
     "id": "pl2-28",
@@ -1597,8 +1597,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/28_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "pl2-29",
@@ -1664,8 +1664,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/29_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "pl2-30",
@@ -1729,8 +1729,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/30_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "pl2-31",
@@ -1782,8 +1782,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/31_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "pl2-32",
@@ -1843,8 +1843,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/32_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "pl2-33",
@@ -1898,8 +1898,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/33_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "pl2-34",
@@ -1955,8 +1955,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/34_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "pl2-35",
@@ -2008,8 +2008,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/35_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "pl2-36",
@@ -2060,8 +2060,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/36_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "pl2-37",
@@ -2117,8 +2117,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/37_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "pl2-38",
@@ -2168,8 +2168,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/38_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "pl2-39",
@@ -2224,8 +2224,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/39_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "pl2-40",
@@ -2281,8 +2281,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/40_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "pl2-41",
@@ -2339,8 +2339,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 471,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/41_hires.png",
+    "nationalPokedexNumber": 471
   },
   {
     "id": "pl2-42",
@@ -2393,8 +2393,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/42_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "pl2-43",
@@ -2445,8 +2445,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/43_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "pl2-44",
@@ -2505,8 +2505,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/44_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2573,8 +2573,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 470,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/45_hires.png",
+    "nationalPokedexNumber": 470
   },
   {
     "id": "pl2-46",
@@ -2629,8 +2629,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/46_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "pl2-47",
@@ -2675,8 +2675,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/47_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "pl2-48",
@@ -2726,8 +2726,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/48_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "pl2-49",
@@ -2787,8 +2787,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/49_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "pl2-50",
@@ -2839,8 +2839,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/50_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "pl2-51",
@@ -2901,8 +2901,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/51_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "pl2-52",
@@ -2970,8 +2970,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/52_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "pl2-53",
@@ -3027,8 +3027,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/53_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -3087,8 +3087,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 340,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/54_hires.png",
+    "nationalPokedexNumber": 340
   },
   {
     "id": "pl2-55",
@@ -3140,8 +3140,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/55_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "pl2-56",
@@ -3190,8 +3190,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 424,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/56_hires.png",
+    "nationalPokedexNumber": 424
   },
   {
     "id": "pl2-57",
@@ -3246,8 +3246,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/57_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -3304,8 +3304,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/58_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -3356,8 +3356,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/59_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3416,8 +3416,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/60_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "pl2-61",
@@ -3474,8 +3474,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/61_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "pl2-62",
@@ -3530,8 +3530,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/62_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "pl2-63",
@@ -3582,8 +3582,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/63_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3643,8 +3643,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/64_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -3704,8 +3704,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/65_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "pl2-66",
@@ -3751,8 +3751,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/66_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -3801,8 +3801,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 352,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/67_hires.png",
+    "nationalPokedexNumber": 352
   },
   {
     "id": "pl2-68",
@@ -3851,8 +3851,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/68_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3901,8 +3901,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 446,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/69_hires.png",
+    "nationalPokedexNumber": 446,
     "evolvesTo": [
       "Snorlax"
     ]
@@ -3951,8 +3951,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 446,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/70_hires.png",
+    "nationalPokedexNumber": 446,
     "evolvesTo": [
       "Snorlax"
     ]
@@ -4004,8 +4004,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/71_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -4057,8 +4057,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/72_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -4113,8 +4113,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/73_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -4169,8 +4169,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/74_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -4229,8 +4229,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/75_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -4286,8 +4286,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/76_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "pl2-77",
@@ -4338,8 +4338,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/77_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -4396,8 +4396,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/78_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -4448,8 +4448,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 422,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/79_hires.png",
+    "nationalPokedexNumber": 422,
     "evolvesTo": [
       "Gastrodon"
     ]
@@ -4502,8 +4502,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 422,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/80_hires.png",
+    "nationalPokedexNumber": 422,
     "evolvesTo": [
       "Gastrodon"
     ]
@@ -4566,8 +4566,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/81_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "pl2-82",
@@ -4617,8 +4617,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/82_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -4669,8 +4669,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/83_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -4723,8 +4723,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/84_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4781,8 +4781,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/85_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -4833,8 +4833,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/86_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -4892,8 +4892,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/87_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "pl2-88",
@@ -5215,8 +5215,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/103_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "pl2-104",
@@ -5261,8 +5261,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/104_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "pl2-105",
@@ -5314,8 +5314,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/105_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "pl2-106",
@@ -5364,8 +5364,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/106_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "pl2-107",
@@ -5424,8 +5424,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 450,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/107_hires.png",
+    "nationalPokedexNumber": 450
   },
   {
     "id": "pl2-108",
@@ -5471,8 +5471,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/108_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "pl2-109",
@@ -5523,8 +5523,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 405,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/109_hires.png",
+    "nationalPokedexNumber": 405
   },
   {
     "id": "pl2-110",
@@ -5579,8 +5579,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/110_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "pl2-111",
@@ -5633,8 +5633,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/111_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "pl2-112",
@@ -5683,8 +5683,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/112_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -5737,8 +5737,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/113_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -5781,8 +5781,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl2/114_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -5844,8 +5844,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT1_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pl2-RT2",
@@ -5909,8 +5909,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT2_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pl2-RT3",
@@ -5971,8 +5971,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT3_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pl2-RT4",
@@ -6035,8 +6035,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT4_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pl2-RT5",
@@ -6097,8 +6097,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl2/RT5_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pl2-RT6",
diff --git a/json/cards/Roaring Skies.json b/json/cards/Roaring Skies.json
index ff6075dac..1214747b4 100644
--- a/json/cards/Roaring Skies.json	
+++ b/json/cards/Roaring Skies.json	
@@ -44,8 +44,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 102,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/1_hires.png",
+    "nationalPokedexNumber": 102,
     "evolvesTo": [
       "Exeggutor"
     ]
@@ -100,8 +100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 103,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/2_hires.png",
+    "nationalPokedexNumber": 103
   },
   {
     "id": "xy6-3",
@@ -149,8 +149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/3_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -195,8 +195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 266,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/4_hires.png",
+    "nationalPokedexNumber": 266,
     "evolvesTo": [
       "Beautifly"
     ]
@@ -242,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/5_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "xy6-6",
@@ -294,8 +294,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 268,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/6_hires.png",
+    "nationalPokedexNumber": 268,
     "evolvesTo": [
       "Dustox"
     ]
@@ -351,8 +351,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/7_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "xy6-8",
@@ -406,8 +406,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/8_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "xy6-9",
@@ -445,8 +445,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/9_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -491,8 +491,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/10_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -537,8 +537,8 @@
         "text": "This attack does 50 damage times the number of damage counters on this Pokémon."
       }
     ],
-    "nationalPokedexNumber": 292,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/11_hires.png",
+    "nationalPokedexNumber": 292
   },
   {
     "id": "xy6-12",
@@ -591,8 +591,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 357,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/12_hires.png",
+    "nationalPokedexNumber": 357
   },
   {
     "id": "xy6-13",
@@ -640,8 +640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/13_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "xy6-14",
@@ -677,8 +677,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 662,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/14_hires.png",
+    "nationalPokedexNumber": 662,
     "evolvesTo": [
       "Talonflame"
     ]
@@ -727,8 +727,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 663,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/15_hires.png",
+    "nationalPokedexNumber": 663
   },
   {
     "id": "xy6-16",
@@ -784,8 +784,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/16_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "xy6-17",
@@ -845,8 +845,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/17_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "xy6-18",
@@ -890,8 +890,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/18_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -953,8 +953,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/19_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "xy6-20",
@@ -1008,8 +1008,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/20_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1066,8 +1066,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/21_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -1126,8 +1126,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/22_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "xy6-23",
@@ -1183,8 +1183,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/23_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "xy6-24",
@@ -1228,8 +1228,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/24_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -1287,8 +1287,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/25_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "xy6-26",
@@ -1348,8 +1348,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/26_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "xy6-27",
@@ -1387,8 +1387,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/27_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -1434,8 +1434,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/28_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -1487,8 +1487,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/29_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "xy6-30",
@@ -1532,8 +1532,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/30_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -1588,8 +1588,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/31_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "xy6-32",
@@ -1648,8 +1648,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/32_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "xy6-33",
@@ -1697,8 +1697,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 386,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/33_hires.png",
+    "nationalPokedexNumber": 386
   },
   {
     "id": "xy6-34",
@@ -1752,8 +1752,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/34_hires.png",
+    "nationalPokedexNumber": 475,
     "evolvesTo": "M Gallade-EX"
   },
   {
@@ -1800,8 +1800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/35_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "xy6-36",
@@ -1839,8 +1839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/36_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -1892,8 +1892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 472,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/37_hires.png",
+    "nationalPokedexNumber": 472
   },
   {
     "id": "xy6-38",
@@ -1943,8 +1943,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 688,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/38_hires.png",
+    "nationalPokedexNumber": 688,
     "evolvesTo": [
       "Barbaracle"
     ]
@@ -2002,8 +2002,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 701,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/39_hires.png",
+    "nationalPokedexNumber": 701
   },
   {
     "id": "xy6-40",
@@ -2053,8 +2053,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/40_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "xy6-41",
@@ -2108,8 +2108,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 686,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/41_hires.png",
+    "nationalPokedexNumber": 686,
     "evolvesTo": [
       "Malamar"
     ]
@@ -2166,8 +2166,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/42_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "xy6-43",
@@ -2211,8 +2211,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/43_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -2271,8 +2271,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/44_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -2332,8 +2332,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/45_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "xy6-46",
@@ -2389,8 +2389,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/46_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "xy6-47",
@@ -2442,8 +2442,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 703,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/47_hires.png",
+    "nationalPokedexNumber": 703
   },
   {
     "id": "xy6-48",
@@ -2497,8 +2497,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 707,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/48_hires.png",
+    "nationalPokedexNumber": 707
   },
   {
     "id": "xy6-49",
@@ -2546,8 +2546,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/49_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2601,8 +2601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/50_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -2653,8 +2653,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/51_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "xy6-52",
@@ -2713,8 +2713,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/52_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "xy6-53",
@@ -2763,8 +2763,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/53_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "xy6-54",
@@ -2803,8 +2803,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/54_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2855,8 +2855,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/55_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -2907,8 +2907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/56_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -2976,8 +2976,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/57_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "xy6-58",
@@ -3031,8 +3031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/58_hires.png",
+    "nationalPokedexNumber": 381,
     "evolvesTo": "M Latios-EX"
   },
   {
@@ -3075,8 +3075,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/59_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "xy6-60",
@@ -3131,8 +3131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/60_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -3185,8 +3185,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/61_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "xy6-62",
@@ -3236,8 +3236,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/62_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "xy6-63",
@@ -3284,8 +3284,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/63_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "xy6-64",
@@ -3336,8 +3336,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/64_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "xy6-65",
@@ -3382,8 +3382,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/65_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -3443,8 +3443,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/66_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "xy6-67",
@@ -3493,8 +3493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/67_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3541,8 +3541,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/68_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "xy6-69",
@@ -3596,8 +3596,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/69_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "xy6-70",
@@ -3641,8 +3641,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/70_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -3701,8 +3701,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/71_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "xy6-72",
@@ -3763,8 +3763,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/72_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "xy6-73",
@@ -3808,8 +3808,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 333,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/73_hires.png",
+    "nationalPokedexNumber": 333,
     "evolvesTo": [
       "Altaria"
     ]
@@ -3867,8 +3867,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/74_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "xy6-75",
@@ -3927,8 +3927,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/75_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -3984,8 +3984,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/76_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "xy6-77",
@@ -4038,8 +4038,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/77_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "xy6-77a",
@@ -4092,8 +4092,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/77a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/77a_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "xy6-78",
@@ -4147,8 +4147,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 519,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/78_hires.png",
+    "nationalPokedexNumber": 519,
     "evolvesTo": [
       "Tranquill"
     ]
@@ -4197,8 +4197,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 520,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/79_hires.png",
+    "nationalPokedexNumber": 520,
     "evolvesTo": [
       "Unfezant"
     ]
@@ -4257,8 +4257,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 521,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/80_hires.png",
+    "nationalPokedexNumber": 521
   },
   {
     "id": "xy6-81",
@@ -4316,8 +4316,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 521,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/81_hires.png",
+    "nationalPokedexNumber": 521
   },
   {
     "id": "xy6-82",
@@ -4361,8 +4361,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/82_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -4697,8 +4697,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 642,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/98_hires.png",
+    "nationalPokedexNumber": 642
   },
   {
     "id": "xy6-99",
@@ -4752,8 +4752,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/99_hires.png",
+    "nationalPokedexNumber": 475,
     "evolvesTo": "M Gallade-EX"
   },
   {
@@ -4800,8 +4800,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/100_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "xy6-101",
@@ -4855,8 +4855,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/101_hires.png",
+    "nationalPokedexNumber": 381,
     "evolvesTo": "M Latios-EX"
   },
   {
@@ -4899,8 +4899,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/102_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "xy6-103",
@@ -4950,8 +4950,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/103_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "xy6-104",
@@ -5010,8 +5010,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy6/104_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -5067,8 +5067,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/105_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "xy6-106",
@@ -5121,8 +5121,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy6/106_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "xy6-107",
diff --git a/json/cards/Ruby & Sapphire.json b/json/cards/Ruby & Sapphire.json
index ad442d576..337141674 100644
--- a/json/cards/Ruby & Sapphire.json	
+++ b/json/cards/Ruby & Sapphire.json	
@@ -29,7 +29,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin. If heads, this attack does 10 damage times the number of damage counters on Aggron."
       },
       {
@@ -53,7 +53,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 5,
-        "damage": "70x",
+        "damage": "70×",
         "text": "Flip 2 coins. This attack does 70 damage times the number of heads."
       }
     ],
@@ -69,8 +69,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/1_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "ex1-2",
@@ -122,8 +122,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 267,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/2_hires.png",
+    "nationalPokedexNumber": 267
   },
   {
     "id": "ex1-3",
@@ -170,8 +170,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/3_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex1-4",
@@ -225,8 +225,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/4_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex1-5",
@@ -260,7 +260,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to all of your Active Pokémon."
       }
     ],
@@ -270,8 +270,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/5_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "ex1-6",
@@ -324,8 +324,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 269,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/6_hires.png",
+    "nationalPokedexNumber": 269
   },
   {
     "id": "ex1-7",
@@ -360,7 +360,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the total amount of Energy attached to Gardevoir and the Defending Pokémon."
       }
     ],
@@ -370,8 +370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/7_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "ex1-8",
@@ -422,8 +422,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/8_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "ex1-9",
@@ -479,8 +479,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/9_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex1-10",
@@ -532,8 +532,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/10_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex1-11",
@@ -593,8 +593,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/11_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "ex1-12",
@@ -643,8 +643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 289,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/12_hires.png",
+    "nationalPokedexNumber": 289
   },
   {
     "id": "ex1-13",
@@ -693,8 +693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/13_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "ex1-14",
@@ -751,8 +751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/14_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "ex1-15",
@@ -805,8 +805,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/15_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex1-16",
@@ -857,8 +857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/16_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "ex1-17",
@@ -900,7 +900,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "60x",
+        "damage": "60×",
         "text": "Flip 2 coins. This attack does 60 damage times the number of heads."
       }
     ],
@@ -910,8 +910,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/17_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "ex1-18",
@@ -959,8 +959,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/18_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -1029,8 +1029,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/19_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "ex1-20",
@@ -1068,7 +1068,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -1084,8 +1084,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/20_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "ex1-21",
@@ -1131,8 +1131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/21_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "ex1-22",
@@ -1178,8 +1178,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/22_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "ex1-23",
@@ -1235,8 +1235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/23_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "ex1-24",
@@ -1286,8 +1286,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/24_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "ex1-25",
@@ -1325,7 +1325,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -1341,8 +1341,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/25_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -1390,8 +1390,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 268,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/26_hires.png",
+    "nationalPokedexNumber": 268,
     "evolvesTo": [
       "Dustox"
     ]
@@ -1434,7 +1434,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -1444,8 +1444,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/27_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1459,7 +1459,7 @@
     "evolvesFrom": "Torchic",
     "ability": {
       "name": "Natural Cure",
-      "text": "When you attach a Fire Energy from your hand to Combusken, remove all Special Conditions from Combusken.",
+      "text": "When you attach a Fire Energy card from your hand to Combusken, remove all Special Conditions from Combusken.",
       "type": "Poké-Body"
     },
     "hp": "80",
@@ -1493,8 +1493,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 256,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/28_hires.png",
+    "nationalPokedexNumber": 256,
     "evolvesTo": [
       "Blaziken"
     ]
@@ -1546,8 +1546,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/29_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "ex1-30",
@@ -1601,8 +1601,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/30_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -1662,8 +1662,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/31_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -1717,8 +1717,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/32_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -1772,8 +1772,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/33_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "ex1-34",
@@ -1823,8 +1823,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/34_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -1876,8 +1876,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/35_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -1939,8 +1939,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/36_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2001,8 +2001,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/37_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2044,7 +2044,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip a coin until you get tails. This attack does 40 damage times the number of heads."
       }
     ],
@@ -2054,8 +2054,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 264,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/38_hires.png",
+    "nationalPokedexNumber": 264
   },
   {
     "id": "ex1-39",
@@ -2112,8 +2112,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/39_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex1-40",
@@ -2163,8 +2163,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/40_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -2212,8 +2212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/41_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -2273,8 +2273,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/42_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex1-43",
@@ -2319,8 +2319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 266,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/43_hires.png",
+    "nationalPokedexNumber": 266,
     "evolvesTo": [
       "Beautifly"
     ]
@@ -2370,8 +2370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/44_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -2422,8 +2422,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/45_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -2474,8 +2474,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/46_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "ex1-47",
@@ -2505,7 +2505,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -2526,8 +2526,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/47_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -2581,8 +2581,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/48_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -2639,8 +2639,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/49_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2688,8 +2688,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/50_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2735,8 +2735,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/51_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -2783,8 +2783,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/52_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2841,8 +2841,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/53_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2893,8 +2893,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/54_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -2925,7 +2925,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage for each damage counter on Goldeen."
       }
     ],
@@ -2935,8 +2935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/55_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -2987,8 +2987,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/56_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3039,8 +3039,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/57_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3081,8 +3081,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/58_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3123,8 +3123,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/59_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -3165,7 +3165,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3175,8 +3175,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/60_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -3227,8 +3227,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/61_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3279,8 +3279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/62_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -3327,8 +3327,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/63_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3385,8 +3385,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/64_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3433,8 +3433,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/65_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3475,8 +3475,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/66_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3527,8 +3527,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/67_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3579,8 +3579,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/68_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3627,8 +3627,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/69_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -3678,8 +3678,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/70_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -3730,8 +3730,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/71_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -3788,8 +3788,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/72_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -3840,8 +3840,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/73_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -3882,8 +3882,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/74_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -3930,8 +3930,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/75_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -3988,8 +3988,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/76_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -4036,8 +4036,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/77_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -4087,8 +4087,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 265,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/78_hires.png",
+    "nationalPokedexNumber": 265,
     "evolvesTo": [
       "Silcoon",
       "Cascoon"
@@ -4120,7 +4120,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4130,8 +4130,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 263,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/79_hires.png",
+    "nationalPokedexNumber": 263,
     "evolvesTo": [
       "Linoone"
     ]
@@ -4479,8 +4479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/96_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -4543,8 +4543,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/97_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -4601,8 +4601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/98_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "ex1-99",
@@ -4657,8 +4657,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/99_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "ex1-100",
@@ -4712,8 +4712,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/100_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -4771,8 +4771,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex1/101_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ex1-102",
@@ -4831,8 +4831,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/102_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -4867,7 +4867,7 @@
           "Darkness"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -4878,7 +4878,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin for each of your Pokémon in play (including Sneasel ex). This attack does 20 damage times the number of heads."
       }
     ],
@@ -4894,8 +4894,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex1/103_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
diff --git a/json/cards/Sandstorm.json b/json/cards/Sandstorm.json
index b4082b26b..b0c33df4f 100644
--- a/json/cards/Sandstorm.json
+++ b/json/cards/Sandstorm.json
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/1_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "ex2-2",
@@ -92,8 +92,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/2_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "ex2-3",
@@ -149,8 +149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/3_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "ex2-4",
@@ -207,8 +207,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/4_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -264,8 +264,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/5_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ex2-6",
@@ -322,8 +322,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/6_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ex2-7",
@@ -370,8 +370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/7_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "ex2-8",
@@ -424,8 +424,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/8_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "ex2-9",
@@ -473,8 +473,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/9_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "ex2-10",
@@ -522,8 +522,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/10_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "ex2-11",
@@ -572,8 +572,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/11_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "ex2-12",
@@ -621,8 +621,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/12_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex2-13",
@@ -676,8 +676,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/13_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "ex2-14",
@@ -700,6 +700,9 @@
     "series": "EX",
     "set": "Sandstorm",
     "setCode": "ex2",
+    "types": [
+      "Colorless"
+    ],
     "attacks": [
       {
         "name": "Target Slash",
@@ -728,11 +731,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Colorless"
-    ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/14_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "ex2-15",
@@ -778,8 +778,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/15_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ex2-16",
@@ -829,8 +829,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/16_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "ex2-17",
@@ -875,8 +875,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/17_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "ex2-18",
@@ -910,7 +910,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -920,8 +920,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 352,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/18_hires.png",
+    "nationalPokedexNumber": 352
   },
   {
     "id": "ex2-19",
@@ -971,8 +971,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/19_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "ex2-20",
@@ -1015,8 +1015,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/20_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -1067,8 +1067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/21_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "ex2-22",
@@ -1122,8 +1122,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/22_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "ex2-23",
@@ -1185,8 +1185,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/23_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ex2-24",
@@ -1242,8 +1242,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/24_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ex2-25",
@@ -1294,8 +1294,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/25_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ex2-26",
@@ -1341,8 +1341,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/26_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "ex2-27",
@@ -1391,8 +1391,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/27_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -1436,7 +1436,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 2 coins. This attack does 40 damage times the number of heads."
       }
     ],
@@ -1446,8 +1446,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/28_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -1496,8 +1496,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/29_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "ex2-30",
@@ -1536,7 +1536,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin for each Energy attached to all of your Active Pokémon. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1546,8 +1546,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/30_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "ex2-31",
@@ -1590,8 +1590,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 298,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/31_hires.png",
+    "nationalPokedexNumber": 298,
     "evolvesTo": [
       "Marill"
     ]
@@ -1632,8 +1632,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/32_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -1686,8 +1686,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/33_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "ex2-34",
@@ -1728,7 +1728,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of basic Energy attached to all of the Active Pokémon (both yours and your opponent's)."
       }
     ],
@@ -1738,8 +1738,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/34_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "ex2-35",
@@ -1794,8 +1794,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/35_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1841,8 +1841,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 239,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/36_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
     ]
@@ -1899,8 +1899,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/37_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "ex2-38",
@@ -1953,8 +1953,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/38_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "ex2-39",
@@ -2009,8 +2009,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/39_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -2064,8 +2064,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/40_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -2126,8 +2126,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/41_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -2180,8 +2180,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/42_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -2235,8 +2235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 345,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/43_hires.png",
+    "nationalPokedexNumber": 345,
     "evolvesTo": [
       "Cradily"
     ]
@@ -2275,7 +2275,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2285,8 +2285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 264,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/44_hires.png",
+    "nationalPokedexNumber": 264
   },
   {
     "id": "ex2-45",
@@ -2321,7 +2321,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2331,8 +2331,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/45_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -2374,7 +2374,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -2384,8 +2384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/46_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -2442,8 +2442,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/47_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -2497,8 +2497,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/48_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -2552,8 +2552,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/49_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -2599,8 +2599,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/50_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "ex2-51",
@@ -2652,8 +2652,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/51_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2706,8 +2706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 288,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/52_hires.png",
+    "nationalPokedexNumber": 288,
     "evolvesTo": [
       "Slaking"
     ]
@@ -2763,8 +2763,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/53_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "ex2-54",
@@ -2807,8 +2807,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 360,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/54_hires.png",
+    "nationalPokedexNumber": 360,
     "evolvesTo": [
       "Wobbuffet"
     ]
@@ -2859,8 +2859,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/55_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "ex2-56",
@@ -2905,8 +2905,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/56_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -2952,8 +2952,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/57_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -2994,8 +2994,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/58_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -3045,8 +3045,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/59_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -3096,8 +3096,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/60_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "ex2-61",
@@ -3150,8 +3150,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/61_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -3208,8 +3208,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/62_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -3259,8 +3259,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/63_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -3308,8 +3308,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/64_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -3356,8 +3356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/65_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -3403,8 +3403,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/66_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -3455,8 +3455,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/67_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -3488,7 +3488,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads. If either of the coins is heads, the Defending Pokémon is now Paralyzed."
       }
     ],
@@ -3498,8 +3498,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/68_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -3549,8 +3549,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/69_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -3602,8 +3602,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/70_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3658,8 +3658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/71_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3711,8 +3711,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/72_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -3753,8 +3753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/73_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -3794,7 +3794,7 @@
           "Psychic"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the amount of Energy attached to the Defending Pokémon."
       }
     ],
@@ -3804,8 +3804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/74_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -3846,8 +3846,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/75_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -3888,8 +3888,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/76_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3930,8 +3930,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/77_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -3988,8 +3988,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/78_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -4040,8 +4040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/79_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -4082,8 +4082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 287,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/80_hires.png",
+    "nationalPokedexNumber": 287,
     "evolvesTo": [
       "Vigoroth"
     ]
@@ -4139,8 +4139,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/81_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -4191,8 +4191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/82_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -4247,8 +4247,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/83_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -4295,8 +4295,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/84_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -4347,8 +4347,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 263,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex2/85_hires.png",
+    "nationalPokedexNumber": 263,
     "evolvesTo": [
       "Linoone"
     ]
@@ -4563,8 +4563,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/94_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "ex2-95",
@@ -4635,8 +4635,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/95_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "ex2-96",
@@ -4683,7 +4683,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the total amount of Energy attached to all Pokemon in play."
       }
     ],
@@ -4697,8 +4697,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/96_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "ex2-97",
@@ -4732,7 +4732,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip a number of coins equal to the amount of Energy attached to Kabutops ex. This attack does 40 damage times the number of heads. You can't flip more than 3 coins in this way."
       },
       {
@@ -4758,8 +4758,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/97_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "ex2-98",
@@ -4813,8 +4813,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/98_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex2-99",
@@ -4877,8 +4877,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/99_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ex2-100",
@@ -4941,7 +4941,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex2/100_hires.png",
+    "nationalPokedexNumber": 321
   }
 ]
diff --git a/json/cards/Secret Wonders.json b/json/cards/Secret Wonders.json
index 89b6f53af..4afef9bb9 100644
--- a/json/cards/Secret Wonders.json	
+++ b/json/cards/Secret Wonders.json	
@@ -52,8 +52,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "dp3-2",
@@ -101,8 +101,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/2_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "dp3-3",
@@ -158,8 +158,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/3_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "dp3-4",
@@ -206,8 +206,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/4_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "dp3-5",
@@ -260,8 +260,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/5_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "dp3-6",
@@ -314,8 +314,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 475,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/6_hires.png",
+    "nationalPokedexNumber": 475
   },
   {
     "id": "dp3-7",
@@ -363,8 +363,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/7_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "dp3-8",
@@ -420,8 +420,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 423,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/8_hires.png",
+    "nationalPokedexNumber": 423
   },
   {
     "id": "dp3-9",
@@ -483,8 +483,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 423,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/9_hires.png",
+    "nationalPokedexNumber": 423
   },
   {
     "id": "dp3-10",
@@ -522,7 +522,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of different types of basic Energy cards attached to Ho-Oh."
       }
     ],
@@ -538,8 +538,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/10_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "dp3-11",
@@ -588,8 +588,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/11_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "dp3-12",
@@ -645,8 +645,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 463,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/12_hires.png",
+    "nationalPokedexNumber": 463
   },
   {
     "id": "dp3-13",
@@ -694,8 +694,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 272,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/13_hires.png",
+    "nationalPokedexNumber": 272
   },
   {
     "id": "dp3-14",
@@ -752,8 +752,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/14_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "dp3-15",
@@ -803,8 +803,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/15_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "dp3-16",
@@ -857,8 +857,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/16_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "dp3-17",
@@ -909,8 +909,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/17_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "dp3-18",
@@ -971,8 +971,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/18_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "dp3-19",
@@ -1018,8 +1018,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/19_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "dp3-20",
@@ -1068,8 +1068,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/20_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "dp3-21",
@@ -1123,8 +1123,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/21_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "dp3-22",
@@ -1173,8 +1173,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/22_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "dp3-23",
@@ -1230,8 +1230,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 354,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/23_hires.png",
+    "nationalPokedexNumber": 354
   },
   {
     "id": "dp3-24",
@@ -1286,8 +1286,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/24_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "dp3-25",
@@ -1326,7 +1326,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Discard all Lightning Energy attached to Electivire. Flip a coin for each Lightning Energy you discarded. This attack does 50 damage times the number of heads."
       }
     ],
@@ -1342,8 +1342,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/25_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "dp3-26",
@@ -1392,8 +1392,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/26_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "dp3-27",
@@ -1443,8 +1443,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/27_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "dp3-28",
@@ -1494,8 +1494,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/28_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "dp3-29",
@@ -1558,8 +1558,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/29_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "dp3-30",
@@ -1610,8 +1610,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/30_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "dp3-31",
@@ -1648,7 +1648,7 @@
           "Fire"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of Fire Energy attached to Magmortar."
       },
       {
@@ -1669,8 +1669,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/31_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "dp3-32",
@@ -1720,8 +1720,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/32_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "dp3-33",
@@ -1774,8 +1774,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 414,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/33_hires.png",
+    "nationalPokedexNumber": 414,
     "evolvesTo": [
       "Burmy"
     ]
@@ -1832,8 +1832,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/34_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "dp3-35",
@@ -1887,8 +1887,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 18,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/35_hires.png",
+    "nationalPokedexNumber": 18
   },
   {
     "id": "dp3-36",
@@ -1938,8 +1938,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/36_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "dp3-37",
@@ -1989,8 +1989,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/37_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "dp3-38",
@@ -2043,8 +2043,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 192,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/38_hires.png",
+    "nationalPokedexNumber": 192
   },
   {
     "id": "dp3-39",
@@ -2088,8 +2088,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/39_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp3-40",
@@ -2141,8 +2141,8 @@
         "value": "20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/40_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "dp3-41",
@@ -2189,8 +2189,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/41_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2246,8 +2246,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/42_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2303,8 +2303,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 413,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/43_hires.png",
+    "nationalPokedexNumber": 413,
     "evolvesTo": [
       "Burmy"
     ]
@@ -2359,8 +2359,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/44_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "dp3-45",
@@ -2413,8 +2413,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/45_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "dp3-46",
@@ -2465,8 +2465,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/46_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -2520,8 +2520,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/47_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "dp3-48",
@@ -2582,8 +2582,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 232,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/48_hires.png",
+    "nationalPokedexNumber": 232
   },
   {
     "id": "dp3-49",
@@ -2637,8 +2637,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/49_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "dp3-50",
@@ -2695,8 +2695,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/50_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -2752,8 +2752,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/51_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -2801,8 +2801,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 352,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/52_hires.png",
+    "nationalPokedexNumber": 352
   },
   {
     "id": "dp3-53",
@@ -2853,8 +2853,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 281,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/53_hires.png",
+    "nationalPokedexNumber": 281,
     "evolvesTo": [
       "Gardevoir",
       "Gallade"
@@ -2909,8 +2909,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 271,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/54_hires.png",
+    "nationalPokedexNumber": 271,
     "evolvesTo": [
       "Ludicolo"
     ]
@@ -2963,8 +2963,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/55_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "dp3-56",
@@ -3012,8 +3012,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/56_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "dp3-57",
@@ -3065,8 +3065,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/57_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -3122,8 +3122,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 17,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/58_hires.png",
+    "nationalPokedexNumber": 17,
     "evolvesTo": [
       "Pidgeot"
     ]
@@ -3176,8 +3176,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/59_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "dp3-60",
@@ -3232,8 +3232,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/60_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "dp3-61",
@@ -3279,8 +3279,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/61_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "dp3-62",
@@ -3328,8 +3328,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/62_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -3381,8 +3381,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/63_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "dp3-64",
@@ -3440,8 +3440,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/64_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -3492,8 +3492,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/65_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -3544,8 +3544,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/66_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "dp3-67",
@@ -3589,8 +3589,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 238,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/67_hires.png",
+    "nationalPokedexNumber": 238,
     "evolvesTo": [
       "Jynx"
     ]
@@ -3637,8 +3637,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/68_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp3-69",
@@ -3682,8 +3682,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/69_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/69_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp3-70",
@@ -3727,8 +3727,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/70_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp3-71",
@@ -3772,8 +3772,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/71_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp3-72",
@@ -3818,8 +3818,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/72_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/72_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "dp3-73",
@@ -3871,8 +3871,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/73_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "dp3-74",
@@ -3929,8 +3929,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 329,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/74_hires.png",
+    "nationalPokedexNumber": 329,
     "evolvesTo": [
       "Flygon"
     ]
@@ -3985,8 +3985,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/75_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -4044,8 +4044,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/76_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -4087,7 +4087,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4097,8 +4097,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/77_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -4145,8 +4145,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/78_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -4193,8 +4193,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/79_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -4241,8 +4241,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 412,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/80_hires.png",
+    "nationalPokedexNumber": 412,
     "evolvesTo": [
       "Wormadam"
     ]
@@ -4300,8 +4300,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/81_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -4353,8 +4353,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/82_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -4389,7 +4389,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4399,8 +4399,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/83_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -4452,8 +4452,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/84_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "dp3-85",
@@ -4508,8 +4508,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/85_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -4560,8 +4560,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/86_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -4621,8 +4621,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/87_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -4674,8 +4674,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/88_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -4728,8 +4728,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/89_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -4782,8 +4782,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/90_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -4837,8 +4837,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 108,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/91_hires.png",
+    "nationalPokedexNumber": 108,
     "evolvesTo": [
       "Lickilicky"
     ]
@@ -4890,8 +4890,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 270,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/92_hires.png",
+    "nationalPokedexNumber": 270,
     "evolvesTo": [
       "Lombre"
     ]
@@ -4944,8 +4944,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/93_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -5003,8 +5003,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/94_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -5056,8 +5056,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/95_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -5114,8 +5114,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/96_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -5166,8 +5166,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/97_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -5199,7 +5199,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Phanpy."
       },
       {
@@ -5225,8 +5225,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 231,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/98_hires.png",
+    "nationalPokedexNumber": 231,
     "evolvesTo": [
       "Donphan"
     ]
@@ -5284,8 +5284,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 16,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/99_hires.png",
+    "nationalPokedexNumber": 16,
     "evolvesTo": [
       "Pidgeotto"
     ]
@@ -5336,8 +5336,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/100_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -5385,8 +5385,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 211,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/101_hires.png",
+    "nationalPokedexNumber": 211
   },
   {
     "id": "dp3-102",
@@ -5434,8 +5434,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 280,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/102_hires.png",
+    "nationalPokedexNumber": 280,
     "evolvesTo": [
       "Kirlia"
     ]
@@ -5483,8 +5483,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/103_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -5535,8 +5535,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/104_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -5588,8 +5588,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/105_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -5641,8 +5641,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 422,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/106_hires.png",
+    "nationalPokedexNumber": 422,
     "evolvesTo": [
       "Gastrodon"
     ]
@@ -5693,8 +5693,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 422,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/107_hires.png",
+    "nationalPokedexNumber": 422,
     "evolvesTo": [
       "Gastrodon"
     ]
@@ -5752,8 +5752,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/108_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -5801,8 +5801,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/109_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "dp3-110",
@@ -5857,8 +5857,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 353,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/110_hires.png",
+    "nationalPokedexNumber": 353,
     "evolvesTo": [
       "Banette"
     ]
@@ -5891,7 +5891,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "",
-        "text": "Draw a card from both the top and the bottom of your deck."
+        "text": "Draw a card from the top and the bottom of your deck."
       },
       {
         "name": "Synchro Punch",
@@ -5900,7 +5900,7 @@
         ],
         "convertedEnergyCost": 1,
         "damage": "10+",
-        "text": "If any basic Energy card attached to Spinda is the same type as any Energy card attached to the Defending Pokémon, this attack does 10 damage plus 30 more damage."
+        "text": "If any basic Energy card attached to Spinda is the same type as any Energy attached to the Defending Pokémon, this attack does 10 damage plus 30 more damage."
       }
     ],
     "weaknesses": [
@@ -5909,8 +5909,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/111_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "dp3-112",
@@ -5959,8 +5959,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/112_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -6012,8 +6012,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/113_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "dp3-114",
@@ -6067,8 +6067,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 191,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/114_hires.png",
+    "nationalPokedexNumber": 191,
     "evolvesTo": [
       "Sunflora"
     ]
@@ -6125,8 +6125,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 328,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/115_hires.png",
+    "nationalPokedexNumber": 328,
     "evolvesTo": [
       "Vibrava"
     ]
@@ -6177,8 +6177,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/116_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -6236,8 +6236,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/117_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -6294,8 +6294,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp3/118_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -6567,8 +6567,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/131_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/131_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "dp3-132",
@@ -6625,7 +6625,7 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/132_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp3/132_hires.png",
+    "nationalPokedexNumber": 430
   }
 ]
diff --git a/json/cards/Skyridge.json b/json/cards/Skyridge.json
index 674b0228f..5a8608c74 100644
--- a/json/cards/Skyridge.json
+++ b/json/cards/Skyridge.json
@@ -44,8 +44,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/151_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/151_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "ecard3-1",
@@ -90,8 +90,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/1_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "ecard3-152",
@@ -147,8 +147,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/152_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/152_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ecard3-2",
@@ -195,8 +195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/2_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "ecard3-153",
@@ -258,8 +258,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/153_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/153_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "ecard3-3",
@@ -315,8 +315,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/3_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "ecard3-154",
@@ -358,8 +358,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/154_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/154_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "ecard3-4",
@@ -421,8 +421,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/4_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "ecard3-5",
@@ -464,8 +464,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/5_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "ecard3-155",
@@ -508,8 +508,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/155_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/155_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ecard3-6",
@@ -552,8 +552,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/6_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ecard3-156",
@@ -606,8 +606,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/156_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/156_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "ecard3-7",
@@ -660,8 +660,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/7_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "ecard3-157",
@@ -716,8 +716,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/157_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/157_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ecard3-8",
@@ -772,8 +772,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/8_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ecard3-158",
@@ -831,8 +831,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/158_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/158_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "ecard3-159",
@@ -886,8 +886,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/159_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/159_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "ecard3-9",
@@ -945,8 +945,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/9_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "ecard3-10",
@@ -1000,8 +1000,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/10_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "ecard3-160",
@@ -1049,8 +1049,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/160_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/160_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ecard3-161",
@@ -1107,8 +1107,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/161_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/161_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ecard3-11",
@@ -1156,8 +1156,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/11_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ecard3-162",
@@ -1209,8 +1209,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/162_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/162_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ecard3-12",
@@ -1267,8 +1267,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/12_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ecard3-163",
@@ -1315,8 +1315,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/163_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/163_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "ecard3-13",
@@ -1368,8 +1368,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/13_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ecard3-14",
@@ -1416,8 +1416,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/14_hires.png",
+    "nationalPokedexNumber": 141
   },
   {
     "id": "ecard3-164",
@@ -1464,8 +1464,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/164_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/164_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "ecard3-165",
@@ -1523,8 +1523,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/165_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/165_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ecard3-15",
@@ -1562,7 +1562,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "50",
-        "text": "This attack's damage isn't affected by Weakness, Resistance, Poké-Power, Poké-Bodies, or any other effects on the Defending POkemon."
+        "text": "This attack's damage isn't affected by Weakness, Resistance, Poké-Powers, Poké-Bodies, or any other effects on the Defending Pokémon."
       }
     ],
     "weaknesses": [
@@ -1571,8 +1571,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/15_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "ecard3-16",
@@ -1630,8 +1630,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/16_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "ecard3-166",
@@ -1685,8 +1685,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/166_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/166_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ecard3-167",
@@ -1734,8 +1734,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/167_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/167_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ecard3-17",
@@ -1789,8 +1789,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/17_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ecard3-18",
@@ -1838,8 +1838,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/18_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ecard3-168",
@@ -1885,8 +1885,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/168_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1935,8 +1935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/19_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1996,8 +1996,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/169_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2058,8 +2058,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/20_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2072,7 +2072,7 @@
     "supertype": "Pokémon",
     "ability": {
       "name": "Fire Immunity",
-      "text": "You can't attach R Energy cards from your hand to Moltres.",
+      "text": "You can't attach Fire Energy cards from your hand to Moltres.",
       "type": "Poké-Body"
     },
     "hp": "80",
@@ -2124,8 +2124,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/170_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/170_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "ecard3-21",
@@ -2187,8 +2187,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/21_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "ecard3-171",
@@ -2236,8 +2236,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/171_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/171_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "ecard3-22",
@@ -2285,8 +2285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 31,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/22_hires.png",
+    "nationalPokedexNumber": 31
   },
   {
     "id": "ecard3-172",
@@ -2341,8 +2341,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/172_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -2409,8 +2409,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/173_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/173_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "ecard3-23",
@@ -2457,8 +2457,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 139,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/23_hires.png",
+    "nationalPokedexNumber": 139
   },
   {
     "id": "ecard3-24",
@@ -2513,8 +2513,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/24_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -2564,8 +2564,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/174_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/174_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "ecard3-175",
@@ -2616,8 +2616,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/175_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/175_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ecard3-25",
@@ -2681,8 +2681,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/25_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "ecard3-176",
@@ -2727,8 +2727,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/176_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/176_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "ecard3-26",
@@ -2775,8 +2775,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/26_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "ecard3-177",
@@ -2837,8 +2837,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/177_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -2892,8 +2892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/27_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ecard3-178",
@@ -2943,8 +2943,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/178_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/178_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ecard3-28",
@@ -2989,8 +2989,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/28_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "ecard3-179",
@@ -3001,7 +3001,7 @@
     "evolvesFrom": "Onix",
     "ability": {
       "name": "Rare Metal",
-      "text": "All basic Energy cards attached to Steelix provide M Energy instead of their usual types.",
+      "text": "All basic Energy cards attached to Steelix provide Metal Energy instead of their usual types.",
       "type": "Poké-Body"
     },
     "hp": "100",
@@ -3057,8 +3057,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/179_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/179_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ecard3-29",
@@ -3119,8 +3119,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/29_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -3174,8 +3174,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/180_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/180_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ecard3-30",
@@ -3225,8 +3225,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/30_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ecard3-181",
@@ -3282,8 +3282,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/181_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/181_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ecard3-31",
@@ -3350,8 +3350,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/31_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ecard3-32",
@@ -3402,8 +3402,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/32_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ecard3-182",
@@ -3449,8 +3449,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/182_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/182_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "ecard3-33",
@@ -3506,8 +3506,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/33_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ecard3-34",
@@ -3553,8 +3553,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/34_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "ecard3-35",
@@ -3600,8 +3600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/35_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "ecard3-36",
@@ -3653,8 +3653,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/36_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ecard3-37",
@@ -3698,8 +3698,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 140,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/37_hires.png",
+    "nationalPokedexNumber": 140,
     "evolvesTo": [
       "Kabutops"
     ]
@@ -3752,8 +3752,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/38_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -3810,8 +3810,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/39_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -3862,8 +3862,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/40_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "ecard3-41",
@@ -3914,8 +3914,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 138,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/41_hires.png",
+    "nationalPokedexNumber": 138,
     "evolvesTo": [
       "Omastar"
     ]
@@ -3965,8 +3965,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/42_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "ecard3-43",
@@ -4027,8 +4027,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/43_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -4081,8 +4081,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/44_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "ecard3-45",
@@ -4127,8 +4127,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/45_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "ecard3-46",
@@ -4172,8 +4172,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/46_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -4212,6 +4212,9 @@
     "series": "E-Card",
     "set": "Skyridge",
     "setCode": "ecard3",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Colorless"
     ],
@@ -4226,11 +4229,8 @@
         "text": "Shuffle a basic Energy card from your discard pile into your deck."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 173,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/48_hires.png",
+    "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
     ]
@@ -4281,8 +4281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/49_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "ecard3-50",
@@ -4326,8 +4326,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/50_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -4373,8 +4373,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/51_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "ecard3-52",
@@ -4431,8 +4431,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/52_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "ecard3-53",
@@ -4475,8 +4475,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/53_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "ecard3-54",
@@ -4524,8 +4524,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/54_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -4588,8 +4588,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/55_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "ecard3-56",
@@ -4646,8 +4646,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/56_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "ecard3-57",
@@ -4691,8 +4691,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/57_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -4743,8 +4743,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 203,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/58_hires.png",
+    "nationalPokedexNumber": 203
   },
   {
     "id": "ecard3-59",
@@ -4792,8 +4792,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/59_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -4847,8 +4847,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/60_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -4903,8 +4903,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/61_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "ecard3-62",
@@ -4952,8 +4952,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/62_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -5013,8 +5013,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/63_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -5067,8 +5067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/64_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "ecard3-65",
@@ -5121,8 +5121,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/65_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -5172,8 +5172,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/66_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -5194,6 +5194,9 @@
     "series": "E-Card",
     "set": "Skyridge",
     "setCode": "ecard3",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Colorless"
     ],
@@ -5208,11 +5211,8 @@
         "text": "Choose 1 of your Pokémon with an Energy card attached to it. Remove 1 damage counter from that Pokémon."
       }
     ],
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
-    "nationalPokedexNumber": 174,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/67_hires.png",
+    "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
     ]
@@ -5263,8 +5263,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/68_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -5317,8 +5317,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/69_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -5366,8 +5366,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/70_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -5421,8 +5421,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/71_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "ecard3-72",
@@ -5475,8 +5475,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/72_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -5527,8 +5527,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/73_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -5579,8 +5579,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/74_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -5630,8 +5630,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/75_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -5681,8 +5681,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/76_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -5741,8 +5741,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/77_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "ecard3-78",
@@ -5780,8 +5780,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/78_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -5838,8 +5838,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/79_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -5890,8 +5890,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/80_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -5941,8 +5941,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/81_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -5984,8 +5984,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 29,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/82_hires.png",
+    "nationalPokedexNumber": 29,
     "evolvesTo": [
       "Nidorina"
     ]
@@ -6040,8 +6040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 30,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/83_hires.png",
+    "nationalPokedexNumber": 30,
     "evolvesTo": [
       "Nidoqueen"
     ]
@@ -6083,8 +6083,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/84_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -6125,8 +6125,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/85_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -6165,8 +6165,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/86_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -6214,8 +6214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/87_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -6268,8 +6268,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/88_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -6322,8 +6322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/89_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "ecard3-90",
@@ -6370,8 +6370,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/90_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -6429,8 +6429,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/91_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -6486,8 +6486,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/92_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -6547,8 +6547,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/93_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "ecard3-94",
@@ -6586,8 +6586,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/94_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -6638,8 +6638,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/95_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -6687,8 +6687,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/96_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "ecard3-97",
@@ -6744,8 +6744,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/97_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "ecard3-98",
@@ -6793,8 +6793,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/98_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -6837,8 +6837,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/99_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -6888,8 +6888,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/100_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "ecard3-101",
@@ -6937,8 +6937,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/101_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -6989,8 +6989,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/102_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "ecard3-103",
@@ -7037,8 +7037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/103_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -7089,8 +7089,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/104_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -7150,8 +7150,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 192,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/105_hires.png",
+    "nationalPokedexNumber": 192
   },
   {
     "id": "ecard3-106",
@@ -7204,8 +7204,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 191,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/106_hires.png",
+    "nationalPokedexNumber": 191,
     "evolvesTo": [
       "Sunflora"
     ]
@@ -7255,8 +7255,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/107_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -7313,8 +7313,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/108_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -7365,8 +7365,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/109_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -7423,8 +7423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/110_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "ecard3-111",
@@ -7472,8 +7472,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 49,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/111_hires.png",
+    "nationalPokedexNumber": 49
   },
   {
     "id": "ecard3-112",
@@ -7521,8 +7521,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 48,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/112_hires.png",
+    "nationalPokedexNumber": 48,
     "evolvesTo": [
       "Venomoth"
     ]
@@ -7573,8 +7573,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/113_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -7615,8 +7615,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/114_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -7666,8 +7666,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/115_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -7726,8 +7726,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/116_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -7783,8 +7783,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/117_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -7835,8 +7835,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/118_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -8336,8 +8336,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/145_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "ecard3-146",
@@ -8398,8 +8398,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/146_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "ecard3-147",
@@ -8453,8 +8453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/147_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/147_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ecard3-148",
@@ -8515,8 +8515,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 76,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/148_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/148_hires.png",
+    "nationalPokedexNumber": 76
   },
   {
     "id": "ecard3-149",
@@ -8574,8 +8574,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/149_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/149_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "ecard3-150",
@@ -8635,7 +8635,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 141,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ecard3/150_hires.png",
+    "nationalPokedexNumber": 141
   }
 ]
diff --git a/json/cards/Steam Siege.json b/json/cards/Steam Siege.json
index 2949d8bff..e14a6c3ba 100644
--- a/json/cards/Steam Siege.json	
+++ b/json/cards/Steam Siege.json	
@@ -49,8 +49,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/1_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -109,8 +109,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/2_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "xy11-3",
@@ -148,8 +148,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/3_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -191,8 +191,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/4_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -243,8 +243,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/5_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "xy11-6",
@@ -299,8 +299,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/6_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -352,8 +352,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/7_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "xy11-8",
@@ -388,8 +388,8 @@
         "text": "This attack's damage isn't affected by Weakness, Resistance, or any other effects on your opponent's Active Pokémon."
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/8_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "xy11-9",
@@ -427,8 +427,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 273,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/9_hires.png",
+    "nationalPokedexNumber": 273,
     "evolvesTo": [
       "Nuzleaf"
     ]
@@ -480,8 +480,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 274,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/10_hires.png",
+    "nationalPokedexNumber": 274,
     "evolvesTo": [
       "Shiftry"
     ]
@@ -504,6 +504,10 @@
     "series": "XY",
     "set": "Steam Siege",
     "setCode": "xy11",
+    "types": [
+      "Grass",
+      "Darkness"
+    ],
     "attacks": [
       {
         "name": "Wicked Wind",
@@ -531,12 +535,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Grass",
-      "Darkness"
-    ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/11_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "xy11-12",
@@ -579,8 +579,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 590,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/12_hires.png",
+    "nationalPokedexNumber": 590,
     "evolvesTo": [
       "Amoonguss"
     ]
@@ -633,8 +633,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 591,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/13_hires.png",
+    "nationalPokedexNumber": 591
   },
   {
     "id": "xy11-14",
@@ -674,8 +674,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 636,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/14_hires.png",
+    "nationalPokedexNumber": 636,
     "evolvesTo": [
       "Volcarona"
     ]
@@ -697,6 +697,10 @@
     "series": "XY",
     "set": "Steam Siege",
     "setCode": "xy11",
+    "types": [
+      "Fire",
+      "Grass"
+    ],
     "attacks": [
       {
         "name": "Shimmering Scales",
@@ -725,12 +729,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Fire",
-      "Grass"
-    ],
-    "nationalPokedexNumber": 637,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/15_hires.png",
+    "nationalPokedexNumber": 637
   },
   {
     "id": "xy11-16",
@@ -777,8 +777,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/16_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -830,8 +830,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/17_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "xy11-18",
@@ -879,8 +879,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/18_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -932,8 +932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 391,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/19_hires.png",
+    "nationalPokedexNumber": 391,
     "evolvesTo": [
       "Infernape"
     ]
@@ -986,8 +986,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/20_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "xy11-21",
@@ -1021,8 +1021,8 @@
         "text": "Discard all Fire Energy attached to this Pokémon."
       }
     ],
-    "nationalPokedexNumber": 663,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/21_hires.png",
+    "nationalPokedexNumber": 663
   },
   {
     "id": "xy11-22",
@@ -1061,8 +1061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 667,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/22_hires.png",
+    "nationalPokedexNumber": 667,
     "evolvesTo": [
       "Pyroar"
     ]
@@ -1117,8 +1117,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 668,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/23_hires.png",
+    "nationalPokedexNumber": 668
   },
   {
     "id": "xy11-24",
@@ -1153,8 +1153,8 @@
         "text": "This Pokémon does 50 damage to itself."
       }
     ],
-    "nationalPokedexNumber": 668,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/24_hires.png",
+    "nationalPokedexNumber": 668
   },
   {
     "id": "xy11-25",
@@ -1204,8 +1204,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/25_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xy11-26",
@@ -1233,6 +1233,10 @@
     "text": [
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
     ],
+    "types": [
+      "Fire",
+      "Water"
+    ],
     "attacks": [
       {
         "name": "Volcanic Heat",
@@ -1252,12 +1256,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Fire",
-      "Water"
-    ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/26_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xy11-27",
@@ -1312,8 +1312,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/27_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "xy11-28",
@@ -1352,8 +1352,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 422,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/28_hires.png",
+    "nationalPokedexNumber": 422,
     "evolvesTo": [
       "Gastrodon"
     ]
@@ -1407,8 +1407,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 423,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/29_hires.png",
+    "nationalPokedexNumber": 423
   },
   {
     "id": "xy11-30",
@@ -1447,8 +1447,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 501,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/30_hires.png",
+    "nationalPokedexNumber": 501,
     "evolvesTo": [
       "Dewott"
     ]
@@ -1492,8 +1492,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 502,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/31_hires.png",
+    "nationalPokedexNumber": 502,
     "evolvesTo": [
       "Samurott"
     ]
@@ -1548,8 +1548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 503,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/32_hires.png",
+    "nationalPokedexNumber": 503
   },
   {
     "id": "xy11-33",
@@ -1587,8 +1587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 692,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/33_hires.png",
+    "nationalPokedexNumber": 692,
     "evolvesTo": [
       "Clawitzer"
     ]
@@ -1638,8 +1638,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 693,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/34_hires.png",
+    "nationalPokedexNumber": 693
   },
   {
     "id": "xy11-35",
@@ -1672,8 +1672,8 @@
         "text": "The Defending Pokémon can't retreat during your opponent's next turn. During your next turn, any damage done to that Pokémon by attacks is increased by 120 (after applying Weakness and Resistance)."
       }
     ],
-    "nationalPokedexNumber": 693,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/35_hires.png",
+    "nationalPokedexNumber": 693
   },
   {
     "id": "xy11-36",
@@ -1722,8 +1722,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 712,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/36_hires.png",
+    "nationalPokedexNumber": 712,
     "evolvesTo": [
       "Avalugg"
     ]
@@ -1780,8 +1780,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 713,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/37_hires.png",
+    "nationalPokedexNumber": 713
   },
   {
     "id": "xy11-38",
@@ -1835,8 +1835,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/38_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -1896,8 +1896,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/39_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1953,8 +1953,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/40_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "xy11-41",
@@ -1995,8 +1995,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 595,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/41_hires.png",
+    "nationalPokedexNumber": 595,
     "evolvesTo": [
       "Galvantula"
     ]
@@ -2018,6 +2018,10 @@
     "series": "XY",
     "set": "Steam Siege",
     "setCode": "xy11",
+    "types": [
+      "Lightning",
+      "Grass"
+    ],
     "attacks": [
       {
         "name": "Double Thread",
@@ -2050,12 +2054,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Lightning",
-      "Grass"
-    ],
-    "nationalPokedexNumber": 596,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/42_hires.png",
+    "nationalPokedexNumber": 596
   },
   {
     "id": "xy11-43",
@@ -2103,8 +2103,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 32,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/43_hires.png",
+    "nationalPokedexNumber": 32,
     "evolvesTo": [
       "Nidorino"
     ]
@@ -2159,8 +2159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 33,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/44_hires.png",
+    "nationalPokedexNumber": 33,
     "evolvesTo": [
       "Nidoking"
     ]
@@ -2212,8 +2212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 34,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/45_hires.png",
+    "nationalPokedexNumber": 34
   },
   {
     "id": "xy11-46",
@@ -2257,8 +2257,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/46_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -2317,8 +2317,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/47_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "xy11-48",
@@ -2362,8 +2362,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 607,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/48_hires.png",
+    "nationalPokedexNumber": 607,
     "evolvesTo": [
       "Lampent"
     ]
@@ -2421,8 +2421,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 608,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/49_hires.png",
+    "nationalPokedexNumber": 608,
     "evolvesTo": [
       "Chandelure"
     ]
@@ -2477,8 +2477,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 609,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/50_hires.png",
+    "nationalPokedexNumber": 609
   },
   {
     "id": "xy11-51",
@@ -2528,8 +2528,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/51_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xy11-52",
@@ -2576,8 +2576,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/52_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -2629,8 +2629,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/53_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "xy11-54",
@@ -2680,8 +2680,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 299,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/54_hires.png",
+    "nationalPokedexNumber": 299,
     "evolvesTo": [
       "Probopass"
     ]
@@ -2737,8 +2737,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 476,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/55_hires.png",
+    "nationalPokedexNumber": 476
   },
   {
     "id": "xy11-56",
@@ -2784,8 +2784,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 347,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/56_hires.png",
+    "nationalPokedexNumber": 347,
     "evolvesTo": [
       "Armaldo"
     ]
@@ -2839,8 +2839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 348,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/57_hires.png",
+    "nationalPokedexNumber": 348
   },
   {
     "id": "xy11-58",
@@ -2878,8 +2878,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/58_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -2928,8 +2928,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 454,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/59_hires.png",
+    "nationalPokedexNumber": 454
   },
   {
     "id": "xy11-60",
@@ -2973,8 +2973,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/60_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -3028,8 +3028,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 461,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/61_hires.png",
+    "nationalPokedexNumber": 461
   },
   {
     "id": "xy11-62",
@@ -3071,8 +3071,8 @@
         "text": "Move as many damage counters on your opponent's Benched Pokémon as you like to any of your opponent's other Pokémon in any way you like."
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/62_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "xy11-63",
@@ -3116,8 +3116,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/63_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -3140,6 +3140,10 @@
     "series": "XY",
     "set": "Steam Siege",
     "setCode": "xy11",
+    "types": [
+      "Darkness",
+      "Metal"
+    ],
     "attacks": [
       {
         "name": "Retaliate",
@@ -3173,12 +3177,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Darkness",
-      "Metal"
-    ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/64_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "xy11-65",
@@ -3234,8 +3234,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/65_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/65_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xy11-66",
@@ -3270,8 +3270,8 @@
         "text": "This attack does 30 damage to each of your opponent's Benched Pokémon that has any damage counters on it. (Don't apply Weakness and Resistance for Benched Pokémon.)"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/66_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xy11-67",
@@ -3337,8 +3337,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/67_hires.png",
+    "nationalPokedexNumber": 208,
     "evolvesTo": "M Steelix-EX"
   },
   {
@@ -3365,6 +3365,10 @@
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards.",
       "When 1 of your Pokémon becomes a Mega Evolution Pokémon, your turn ends."
     ],
+    "types": [
+      "Metal",
+      "Fighting"
+    ],
     "attacks": [
       {
         "name": "Canyon Axe",
@@ -3392,12 +3396,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Metal",
-      "Fighting"
-    ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/68_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "xy11-69",
@@ -3457,8 +3457,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 410,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/69_hires.png",
+    "nationalPokedexNumber": 410,
     "evolvesTo": [
       "Bastiodon"
     ]
@@ -3522,8 +3522,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 411,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/70_hires.png",
+    "nationalPokedexNumber": 411
   },
   {
     "id": "xy11-71",
@@ -3568,8 +3568,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 599,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/71_hires.png",
+    "nationalPokedexNumber": 599,
     "evolvesTo": [
       "Klang"
     ]
@@ -3630,8 +3630,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 600,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/72_hires.png",
+    "nationalPokedexNumber": 600,
     "evolvesTo": [
       "Klinklang"
     ]
@@ -3688,8 +3688,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 601,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/73_hires.png",
+    "nationalPokedexNumber": 601
   },
   {
     "id": "xy11-74",
@@ -3744,8 +3744,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 638,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/74_hires.png",
+    "nationalPokedexNumber": 638
   },
   {
     "id": "xy11-75",
@@ -3799,8 +3799,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 801,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/75_hires.png",
+    "nationalPokedexNumber": 801
   },
   {
     "id": "xy11-76",
@@ -3844,8 +3844,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/76_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -3868,6 +3868,10 @@
     "series": "XY",
     "set": "Steam Siege",
     "setCode": "xy11",
+    "types": [
+      "Fairy",
+      "Water"
+    ],
     "attacks": [
       {
         "name": "Play Rough",
@@ -3903,12 +3907,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Fairy",
-      "Water"
-    ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/77_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "xy11-78",
@@ -3968,8 +3968,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/78_hires.png",
+    "nationalPokedexNumber": 282,
     "evolvesTo": "M Gardevoir-EX"
   },
   {
@@ -3994,6 +3994,10 @@
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards.",
       "When 1 of your Pokémon becomes a Mega Evolution Pokémon, your turn ends."
     ],
+    "types": [
+      "Fairy",
+      "Psychic"
+    ],
     "attacks": [
       {
         "name": "Despair Ray",
@@ -4018,12 +4022,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Fairy",
-      "Psychic"
-    ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/79_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "xy11-80",
@@ -4073,8 +4073,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 707,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/80_hires.png",
+    "nationalPokedexNumber": 707
   },
   {
     "id": "xy11-81",
@@ -4130,8 +4130,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/81_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xy11-82",
@@ -4165,8 +4165,8 @@
         "text": "This attack does 20 damage times the amount of Energy attached to all of your Pokémon."
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/82_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xy11-83",
@@ -4217,8 +4217,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 621,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/83_hires.png",
+    "nationalPokedexNumber": 621
   },
   {
     "id": "xy11-84",
@@ -4267,8 +4267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 633,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/84_hires.png",
+    "nationalPokedexNumber": 633,
     "evolvesTo": [
       "Zweilous"
     ]
@@ -4323,8 +4323,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 634,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/85_hires.png",
+    "nationalPokedexNumber": 634,
     "evolvesTo": [
       "Hydreigon"
     ]
@@ -4380,8 +4380,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/86_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "xy11-87",
@@ -4423,8 +4423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 635,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/87_hires.png",
+    "nationalPokedexNumber": 635
   },
   {
     "id": "xy11-88",
@@ -4472,8 +4472,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/88_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -4525,8 +4525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/89_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "xy11-90",
@@ -4574,8 +4574,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/90_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -4628,8 +4628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 424,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/91_hires.png",
+    "nationalPokedexNumber": 424
   },
   {
     "id": "xy11-92",
@@ -4673,8 +4673,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 627,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/92_hires.png",
+    "nationalPokedexNumber": 627,
     "evolvesTo": [
       "Braviary"
     ]
@@ -4735,8 +4735,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 628,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/93_hires.png",
+    "nationalPokedexNumber": 628
   },
   {
     "id": "xy11-94",
@@ -4780,8 +4780,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/94_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -4829,8 +4829,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 662,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/95_hires.png",
+    "nationalPokedexNumber": 662,
     "evolvesTo": [
       "Talonflame"
     ]
@@ -4880,8 +4880,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 663,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/96_hires.png",
+    "nationalPokedexNumber": 663
   },
   {
     "id": "xy11-97",
@@ -4931,8 +4931,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 701,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/97_hires.png",
+    "nationalPokedexNumber": 701
   },
   {
     "id": "xy11-98",
@@ -5113,6 +5113,10 @@
     "text": [
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
     ],
+    "types": [
+      "Fire",
+      "Water"
+    ],
     "attacks": [
       {
         "name": "Volcanic Heat",
@@ -5132,12 +5136,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Fire",
-      "Water"
-    ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/107_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xy11-108",
@@ -5203,8 +5203,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/108_hires.png",
+    "nationalPokedexNumber": 208,
     "evolvesTo": "M Steelix-EX"
   },
   {
@@ -5231,6 +5231,10 @@
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards.",
       "When 1 of your Pokémon becomes a Mega Evolution Pokémon, your turn ends."
     ],
+    "types": [
+      "Metal",
+      "Fighting"
+    ],
     "attacks": [
       {
         "name": "Canyon Axe",
@@ -5258,12 +5262,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Metal",
-      "Fighting"
-    ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/109_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "xy11-110",
@@ -5317,8 +5317,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 801,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/110_hires.png",
+    "nationalPokedexNumber": 801
   },
   {
     "id": "xy11-111",
@@ -5378,8 +5378,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/111_hires.png",
+    "nationalPokedexNumber": 282,
     "evolvesTo": "M Gardevoir-EX"
   },
   {
@@ -5404,6 +5404,10 @@
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards.",
       "When 1 of your Pokémon becomes a Mega Evolution Pokémon, your turn ends."
     ],
+    "types": [
+      "Fairy",
+      "Psychic"
+    ],
     "attacks": [
       {
         "name": "Despair Ray",
@@ -5428,12 +5432,8 @@
         "value": "-20"
       }
     ],
-    "types": [
-      "Fairy",
-      "Psychic"
-    ],
-    "nationalPokedexNumber": 282,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/112_hires.png",
+    "nationalPokedexNumber": 282
   },
   {
     "id": "xy11-113",
@@ -5495,6 +5495,10 @@
     "text": [
       "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
     ],
+    "types": [
+      "Fire",
+      "Water"
+    ],
     "attacks": [
       {
         "name": "Volcanic Heat",
@@ -5514,12 +5518,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Fire",
-      "Water"
-    ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy11/115_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xy11-116",
@@ -5579,8 +5579,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 282,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy11/116_hires.png",
+    "nationalPokedexNumber": 282,
     "evolvesTo": "M Gardevoir-EX"
   }
 ]
diff --git a/json/cards/Stormfront.json b/json/cards/Stormfront.json
index ba8ee4f54..0167f0fce 100644
--- a/json/cards/Stormfront.json
+++ b/json/cards/Stormfront.json
@@ -62,8 +62,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/1_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "dp7-2",
@@ -121,8 +121,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/2_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "dp7-3",
@@ -177,8 +177,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 392,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/3_hires.png",
+    "nationalPokedexNumber": 392
   },
   {
     "id": "dp7-4",
@@ -229,8 +229,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 457,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/4_hires.png",
+    "nationalPokedexNumber": 457
   },
   {
     "id": "dp7-5",
@@ -294,8 +294,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/5_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "dp7-6",
@@ -350,8 +350,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 462,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/6_hires.png",
+    "nationalPokedexNumber": 462
   },
   {
     "id": "dp7-7",
@@ -381,7 +381,7 @@
           "Free"
         ],
         "convertedEnergyCost": 0,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Choose up to 4 in any combination of Pokémon Tool cards and Technical Machine cards in play (both yours and your opponent's) and discard them. This attack does 20 damage times the number of cards discarded in this way."
       },
       {
@@ -407,8 +407,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 429,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/7_hires.png",
+    "nationalPokedexNumber": 429
   },
   {
     "id": "dp7-8",
@@ -473,8 +473,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/8_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "dp7-9",
@@ -534,8 +534,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/9_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "dp7-10",
@@ -599,8 +599,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/10_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "dp7-11",
@@ -667,8 +667,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 389,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/11_hires.png",
+    "nationalPokedexNumber": 389
   },
   {
     "id": "dp7-12",
@@ -727,8 +727,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 460,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/12_hires.png",
+    "nationalPokedexNumber": 460
   },
   {
     "id": "dp7-13",
@@ -793,8 +793,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/13_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "dp7-14",
@@ -856,8 +856,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/14_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "dp7-15",
@@ -899,7 +899,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 4 coins. This attack does 20 damage times the number of heads. If 2 or more of them are heads, the Defending Pokémon is now Poisoned."
       },
       {
@@ -920,8 +920,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 452,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/15_hires.png",
+    "nationalPokedexNumber": 452
   },
   {
     "id": "dp7-16",
@@ -983,8 +983,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/16_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "dp7-17",
@@ -1038,8 +1038,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/17_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "dp7-18",
@@ -1081,7 +1081,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Look at your opponent's hand. This attack does 30 damage times the number of Trainer, Supporter, and Stadium cards in your opponent's hand."
       }
     ],
@@ -1097,8 +1097,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 94,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/18_hires.png",
+    "nationalPokedexNumber": 94
   },
   {
     "id": "dp7-19",
@@ -1130,7 +1130,7 @@
           "Free"
         ],
         "convertedEnergyCost": 0,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Does 30 damage times the number of Magikarp in your discard pile."
       },
       {
@@ -1169,8 +1169,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/19_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "dp7-20",
@@ -1211,7 +1211,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 4 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -1233,8 +1233,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/20_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "dp7-21",
@@ -1270,7 +1270,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads or you may start again. Each time you start again, put 2 damage counters on Mamoswine. (If Mamoswine would be Knocked Out, you can't start again.)"
       },
       {
@@ -1298,8 +1298,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 473,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/21_hires.png",
+    "nationalPokedexNumber": 473
   },
   {
     "id": "dp7-22",
@@ -1352,8 +1352,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/22_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "dp7-23",
@@ -1410,8 +1410,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/23_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "dp7-24",
@@ -1477,8 +1477,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/24_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "dp7-25",
@@ -1534,8 +1534,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/25_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "dp7-26",
@@ -1599,8 +1599,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 435,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/26_hires.png",
+    "nationalPokedexNumber": 435
   },
   {
     "id": "dp7-27",
@@ -1659,8 +1659,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 398,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/27_hires.png",
+    "nationalPokedexNumber": 398
   },
   {
     "id": "dp7-28",
@@ -1705,7 +1705,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "100x",
+        "damage": "100×",
         "text": "Flip a coin until you get tails. This attack does 100 damage times the number of heads."
       }
     ],
@@ -1721,8 +1721,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/28_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "dp7-29",
@@ -1788,8 +1788,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 465,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/29_hires.png",
+    "nationalPokedexNumber": 465
   },
   {
     "id": "dp7-30",
@@ -1828,7 +1828,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the amount of Energy attached to Tyranitar."
       },
       {
@@ -1857,8 +1857,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/30_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "dp7-31",
@@ -1919,8 +1919,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 416,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/31_hires.png",
+    "nationalPokedexNumber": 416
   },
   {
     "id": "dp7-32",
@@ -1978,8 +1978,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 400,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/32_hires.png",
+    "nationalPokedexNumber": 400
   },
   {
     "id": "dp7-33",
@@ -2023,8 +2023,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 406,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/33_hires.png",
+    "nationalPokedexNumber": 406,
     "evolvesTo": [
       "Roselia"
     ]
@@ -2084,8 +2084,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/34_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -2146,8 +2146,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 356,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/35_hires.png",
+    "nationalPokedexNumber": 356,
     "evolvesTo": [
       "Dusknoir"
     ]
@@ -2209,8 +2209,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/36_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "dp7-37",
@@ -2263,8 +2263,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/37_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "dp7-38",
@@ -2318,8 +2318,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 83,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/38_hires.png",
+    "nationalPokedexNumber": 83
   },
   {
     "id": "dp7-39",
@@ -2376,8 +2376,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 253,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/39_hires.png",
+    "nationalPokedexNumber": 253,
     "evolvesTo": [
       "Sceptile"
     ]
@@ -2435,8 +2435,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 93,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/40_hires.png",
+    "nationalPokedexNumber": 93,
     "evolvesTo": [
       "Gengar"
     ]
@@ -2490,8 +2490,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/41_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2552,8 +2552,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/42_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2614,8 +2614,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/43_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2676,8 +2676,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/44_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "dp7-45",
@@ -2727,8 +2727,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 172,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/45_hires.png",
+    "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
     ]
@@ -2792,8 +2792,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/46_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -2848,8 +2848,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/47_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2905,8 +2905,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/48_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "dp7-49",
@@ -2958,8 +2958,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/49_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -3021,8 +3021,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 372,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/50_hires.png",
+    "nationalPokedexNumber": 372,
     "evolvesTo": [
       "Salamence"
     ]
@@ -3081,8 +3081,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/51_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "dp7-52",
@@ -3137,8 +3137,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/52_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -3196,8 +3196,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 371,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/53_hires.png",
+    "nationalPokedexNumber": 371,
     "evolvesTo": [
       "Shelgon"
     ]
@@ -3249,8 +3249,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/54_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -3309,8 +3309,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 436,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/55_hires.png",
+    "nationalPokedexNumber": 436,
     "evolvesTo": [
       "Bronzong"
     ]
@@ -3351,7 +3351,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3367,8 +3367,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/56_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -3416,8 +3416,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/57_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -3474,8 +3474,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/58_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -3533,8 +3533,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/59_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -3592,8 +3592,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/60_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -3644,8 +3644,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 456,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/61_hires.png",
+    "nationalPokedexNumber": 456,
     "evolvesTo": [
       "Lumineon"
     ]
@@ -3702,8 +3702,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/62_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -3761,8 +3761,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/63_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -3814,8 +3814,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/64_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3866,8 +3866,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/65_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3916,8 +3916,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/66_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3975,8 +3975,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/67_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -4033,8 +4033,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/68_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -4089,8 +4089,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/69_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -4151,8 +4151,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/70_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4204,8 +4204,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/71_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -4257,8 +4257,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/72_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -4311,8 +4311,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 451,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/73_hires.png",
+    "nationalPokedexNumber": 451,
     "evolvesTo": [
       "Drapion"
     ]
@@ -4363,8 +4363,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 459,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/74_hires.png",
+    "nationalPokedexNumber": 459,
     "evolvesTo": [
       "Abomasnow"
     ]
@@ -4405,7 +4405,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4421,8 +4421,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/75_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -4464,7 +4464,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4480,8 +4480,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 434,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/76_hires.png",
+    "nationalPokedexNumber": 434,
     "evolvesTo": [
       "Skuntank"
     ]
@@ -4538,8 +4538,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/77_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -4597,8 +4597,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 114,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/78_hires.png",
+    "nationalPokedexNumber": 114,
     "evolvesTo": [
       "Tangrowth"
     ]
@@ -4655,8 +4655,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/79_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -4697,7 +4697,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -4713,8 +4713,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/80_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4771,8 +4771,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/81_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -5071,8 +5071,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/96_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "dp7-97",
@@ -5111,8 +5111,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 485,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/97_hires.png",
+    "nationalPokedexNumber": 485
   },
   {
     "id": "dp7-98",
@@ -5163,8 +5163,8 @@
         "value": "+40"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/98_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "dp7-99",
@@ -5216,8 +5216,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/99_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "dp7-100",
@@ -5270,8 +5270,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/100_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "dp7-101",
@@ -5320,8 +5320,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/101_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -5377,8 +5377,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/102_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -5437,8 +5437,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/dp7/103_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "dp7-SH1",
@@ -5495,8 +5495,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/SH1_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -5564,8 +5564,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 355,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/SH2_hires.png",
+    "nationalPokedexNumber": 355,
     "evolvesTo": [
       "Dusclops"
     ]
@@ -5632,8 +5632,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/dp7/SH3_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
diff --git a/json/cards/Sun & Moon Black Star Promos.json b/json/cards/Sun & Moon Black Star Promos.json
index b237e7395..4b6975f0a 100644
--- a/json/cards/Sun & Moon Black Star Promos.json	
+++ b/json/cards/Sun & Moon Black Star Promos.json	
@@ -44,6 +44,7 @@
   {
     "id": "smp-SM02",
     "name": "Litten",
+    "imageUrl": "https://images.pokemontcg.io/smp/SM02.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
     "hp": "60",
@@ -77,7 +78,6 @@
         "value": "×2"
       }
     ],
-    "imageUrl": "https://images.pokemontcg.io/smp/SM02.png",
     "imageUrlHiRes": "https://images.pokemontcg.io/smp/SM02_hires.png",
     "nationalPokedexNumber": 725,
     "evolvesTo": [
@@ -87,6 +87,7 @@
   {
     "id": "smp-SM03",
     "name": "Popplio",
+    "imageUrl": "https://images.pokemontcg.io/smp/SM03.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
     "hp": "60",
@@ -119,7 +120,6 @@
         "value": "×2"
       }
     ],
-    "imageUrl": "https://images.pokemontcg.io/smp/SM03.png",
     "imageUrlHiRes": "https://images.pokemontcg.io/smp/SM03_hires.png",
     "nationalPokedexNumber": 728,
     "evolvesTo": [
@@ -129,6 +129,7 @@
   {
     "id": "smp-SM04",
     "name": "Pikachu",
+    "imageUrl": "https://images.pokemontcg.io/smp/SM04.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
     "hp": "70",
@@ -146,7 +147,7 @@
     ],
     "attacks": [
       {
-        "name": "Thunderwave",
+        "name": "Thunder Wave",
         "cost": [
           "Lightning"
         ],
@@ -178,7 +179,6 @@
         "value": "-20"
       }
     ],
-    "imageUrl": "https://images.pokemontcg.io/smp/SM04.png",
     "imageUrlHiRes": "https://images.pokemontcg.io/smp/SM04_hires.png",
     "nationalPokedexNumber": 25,
     "evolvesTo": [
@@ -2323,7 +2323,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "10",
         "text": ""
       },
@@ -2702,7 +2702,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "Flip a coin. If heads, search your deck for a card and put it into your hand. Then, shuffle your deck."
       },
@@ -5507,4 +5507,4 @@
       "Raichu"
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/json/cards/Sun & Moon.json b/json/cards/Sun & Moon.json
index b307f4f96..7297b5e30 100644
--- a/json/cards/Sun & Moon.json	
+++ b/json/cards/Sun & Moon.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 10,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/1_hires.png",
+    "nationalPokedexNumber": 10,
     "evolvesTo": [
       "Metapod"
     ]
@@ -101,8 +101,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 11,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/2_hires.png",
+    "nationalPokedexNumber": 11,
     "evolvesTo": [
       "Butterfree"
     ]
@@ -155,8 +155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/3_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "sm1-4",
@@ -195,8 +195,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/4_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -252,8 +252,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/5_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "sm1-6",
@@ -303,8 +303,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/6_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "sm1-7",
@@ -342,8 +342,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/7_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -382,8 +382,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/8_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "sm1-9",
@@ -431,8 +431,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 722,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/9_hires.png",
+    "nationalPokedexNumber": 722,
     "evolvesTo": [
       "Dartrix"
     ]
@@ -485,8 +485,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 723,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/10_hires.png",
+    "nationalPokedexNumber": 723,
     "evolvesTo": [
       "Decidueye"
     ]
@@ -539,8 +539,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 724,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/11_hires.png",
+    "nationalPokedexNumber": 724
   },
   {
     "id": "sm1-12",
@@ -600,8 +600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 724,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/12_hires.png",
+    "nationalPokedexNumber": 724
   },
   {
     "id": "sm1-13",
@@ -641,8 +641,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 736,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/13_hires.png",
+    "nationalPokedexNumber": 736,
     "evolvesTo": [
       "Charjabug"
     ]
@@ -693,8 +693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 753,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/14_hires.png",
+    "nationalPokedexNumber": 753,
     "evolvesTo": [
       "Lurantis"
     ]
@@ -761,8 +761,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 754,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/15_hires.png",
+    "nationalPokedexNumber": 754
   },
   {
     "id": "sm1-16",
@@ -809,8 +809,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 755,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/16_hires.png",
+    "nationalPokedexNumber": 755,
     "evolvesTo": [
       "Shiinotic"
     ]
@@ -859,8 +859,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 756,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/17_hires.png",
+    "nationalPokedexNumber": 756
   },
   {
     "id": "sm1-18",
@@ -907,8 +907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 761,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/18_hires.png",
+    "nationalPokedexNumber": 761,
     "evolvesTo": [
       "Steenee"
     ]
@@ -961,8 +961,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 762,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/19_hires.png",
+    "nationalPokedexNumber": 762,
     "evolvesTo": [
       "Tsareena"
     ]
@@ -1012,8 +1012,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 763,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/20_hires.png",
+    "nationalPokedexNumber": 763
   },
   {
     "id": "sm1-21",
@@ -1054,8 +1054,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/21_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -1112,8 +1112,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/22_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "sm1-23",
@@ -1163,8 +1163,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/23_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "sm1-24",
@@ -1212,8 +1212,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 725,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/24_hires.png",
+    "nationalPokedexNumber": 725,
     "evolvesTo": [
       "Torracat"
     ]
@@ -1267,8 +1267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 726,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/25_hires.png",
+    "nationalPokedexNumber": 726,
     "evolvesTo": [
       "Incineroar"
     ]
@@ -1324,8 +1324,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 727,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/26_hires.png",
+    "nationalPokedexNumber": 727
   },
   {
     "id": "sm1-27",
@@ -1392,8 +1392,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 727,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/27_hires.png",
+    "nationalPokedexNumber": 727
   },
   {
     "id": "sm1-28",
@@ -1432,8 +1432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/28_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -1481,8 +1481,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/29_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "sm1-30",
@@ -1531,8 +1531,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/30_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -1587,8 +1587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/31_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -1644,8 +1644,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/32_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "sm1-33",
@@ -1684,8 +1684,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/33_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -1741,8 +1741,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/34_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "sm1-35",
@@ -1807,8 +1807,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/35_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "sm1-36",
@@ -1857,8 +1857,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/36_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "sm1-37",
@@ -1902,8 +1902,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 278,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/37_hires.png",
+    "nationalPokedexNumber": 278,
     "evolvesTo": [
       "Pelipper"
     ]
@@ -1963,8 +1963,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 279,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/38_hires.png",
+    "nationalPokedexNumber": 279
   },
   {
     "id": "sm1-39",
@@ -2012,8 +2012,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 728,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/39_hires.png",
+    "nationalPokedexNumber": 728,
     "evolvesTo": [
       "Brionne"
     ]
@@ -2068,8 +2068,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 729,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/40_hires.png",
+    "nationalPokedexNumber": 729,
     "evolvesTo": [
       "Primarina"
     ]
@@ -2124,8 +2124,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 730,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/41_hires.png",
+    "nationalPokedexNumber": 730
   },
   {
     "id": "sm1-42",
@@ -2192,8 +2192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 730,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/42_hires.png",
+    "nationalPokedexNumber": 730
   },
   {
     "id": "sm1-43",
@@ -2249,8 +2249,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 740,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/43_hires.png",
+    "nationalPokedexNumber": 740
   },
   {
     "id": "sm1-44",
@@ -2293,8 +2293,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 746,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/44_hires.png",
+    "nationalPokedexNumber": 746
   },
   {
     "id": "sm1-45",
@@ -2332,8 +2332,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 751,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/45_hires.png",
+    "nationalPokedexNumber": 751,
     "evolvesTo": [
       "Araquanid"
     ]
@@ -2383,8 +2383,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 752,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/46_hires.png",
+    "nationalPokedexNumber": 752
   },
   {
     "id": "sm1-47",
@@ -2427,8 +2427,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 771,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/47_hires.png",
+    "nationalPokedexNumber": 771
   },
   {
     "id": "sm1-48",
@@ -2478,8 +2478,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 779,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/48_hires.png",
+    "nationalPokedexNumber": 779
   },
   {
     "id": "sm1-49",
@@ -2534,8 +2534,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/49_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2595,8 +2595,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/50_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "sm1-51",
@@ -2655,8 +2655,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 737,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/51_hires.png",
+    "nationalPokedexNumber": 737,
     "evolvesTo": [
       "Vikavolt"
     ]
@@ -2714,8 +2714,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 738,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/52_hires.png",
+    "nationalPokedexNumber": 738
   },
   {
     "id": "sm1-53",
@@ -2768,8 +2768,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 777,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/53_hires.png",
+    "nationalPokedexNumber": 777
   },
   {
     "id": "sm1-54",
@@ -2813,8 +2813,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/54_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -2869,8 +2869,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/55_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -2926,8 +2926,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/56_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "sm1-57",
@@ -2978,8 +2978,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/57_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -3032,8 +3032,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/58_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "sm1-59",
@@ -3082,8 +3082,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/59_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -3138,8 +3138,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/60_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "sm1-61",
@@ -3204,8 +3204,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/61_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "sm1-62",
@@ -3243,8 +3243,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 747,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/62_hires.png",
+    "nationalPokedexNumber": 747,
     "evolvesTo": [
       "Toxapex"
     ]
@@ -3295,8 +3295,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 748,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/63_hires.png",
+    "nationalPokedexNumber": 748
   },
   {
     "id": "sm1-64",
@@ -3334,8 +3334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 789,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/64_hires.png",
+    "nationalPokedexNumber": 789,
     "evolvesTo": [
       "Cosmoem"
     ]
@@ -3379,8 +3379,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 790,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/65_hires.png",
+    "nationalPokedexNumber": 790,
     "evolvesTo": [
       "Solgaleo",
       "Lunala"
@@ -3453,8 +3453,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 792,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/66_hires.png",
+    "nationalPokedexNumber": 792
   },
   {
     "id": "sm1-67",
@@ -3503,8 +3503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 296,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/67_hires.png",
+    "nationalPokedexNumber": 296,
     "evolvesTo": [
       "Hariyama"
     ]
@@ -3563,8 +3563,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 297,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/68_hires.png",
+    "nationalPokedexNumber": 297
   },
   {
     "id": "sm1-69",
@@ -3605,8 +3605,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 524,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/69_hires.png",
+    "nationalPokedexNumber": 524,
     "evolvesTo": [
       "Boldore"
     ]
@@ -3663,8 +3663,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 525,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/70_hires.png",
+    "nationalPokedexNumber": 525,
     "evolvesTo": [
       "Gigalith"
     ]
@@ -3722,8 +3722,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 526,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/71_hires.png",
+    "nationalPokedexNumber": 526
   },
   {
     "id": "sm1-72",
@@ -3774,8 +3774,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 739,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/72_hires.png",
+    "nationalPokedexNumber": 739,
     "evolvesTo": [
       "Crabominable"
     ]
@@ -3826,8 +3826,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 766,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/73_hires.png",
+    "nationalPokedexNumber": 766
   },
   {
     "id": "sm1-74",
@@ -3878,8 +3878,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 769,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/74_hires.png",
+    "nationalPokedexNumber": 769,
     "evolvesTo": [
       "Palossand"
     ]
@@ -3932,8 +3932,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 770,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/75_hires.png",
+    "nationalPokedexNumber": 770
   },
   {
     "id": "sm1-76",
@@ -3974,8 +3974,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/76_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -4037,8 +4037,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/77_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "sm1-78",
@@ -4082,8 +4082,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/78_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -4140,8 +4140,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/79_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "sm1-80",
@@ -4212,8 +4212,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/80_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "sm1-81",
@@ -4267,8 +4267,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/81_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -4320,8 +4320,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/82_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "sm1-83",
@@ -4378,8 +4378,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/83_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -4440,8 +4440,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/84_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -4503,8 +4503,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/85_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "sm1-86",
@@ -4557,8 +4557,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/86_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -4614,8 +4614,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/87_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "sm1-88",
@@ -4671,8 +4671,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/88_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/88_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "sm1-89",
@@ -4739,8 +4739,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 791,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/89_hires.png",
+    "nationalPokedexNumber": 791
   },
   {
     "id": "sm1-90",
@@ -4784,8 +4784,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/90_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -4845,8 +4845,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/91_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "sm1-92",
@@ -4890,8 +4890,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 742,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/92_hires.png",
+    "nationalPokedexNumber": 742,
     "evolvesTo": [
       "Ribombee"
     ]
@@ -4944,8 +4944,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 743,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/93_hires.png",
+    "nationalPokedexNumber": 743
   },
   {
     "id": "sm1-94",
@@ -4993,8 +4993,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/94_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -5048,8 +5048,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/95_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -5108,8 +5108,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/96_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "sm1-97",
@@ -5153,8 +5153,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 21,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/97_hires.png",
+    "nationalPokedexNumber": 21,
     "evolvesTo": [
       "Fearow"
     ]
@@ -5211,8 +5211,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/98_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "sm1-99",
@@ -5264,8 +5264,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 115,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/99_hires.png",
+    "nationalPokedexNumber": 115
   },
   {
     "id": "sm1-100",
@@ -5330,8 +5330,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/100_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "sm1-101",
@@ -5375,8 +5375,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/101_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -5424,8 +5424,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/102_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "sm1-103",
@@ -5473,8 +5473,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/103_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -5523,8 +5523,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 507,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/104_hires.png",
+    "nationalPokedexNumber": 507,
     "evolvesTo": [
       "Stoutland"
     ]
@@ -5582,8 +5582,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 508,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/105_hires.png",
+    "nationalPokedexNumber": 508
   },
   {
     "id": "sm1-106",
@@ -5627,8 +5627,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 731,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/106_hires.png",
+    "nationalPokedexNumber": 731,
     "evolvesTo": [
       "Trumbeak"
     ]
@@ -5676,8 +5676,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 732,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/107_hires.png",
+    "nationalPokedexNumber": 732,
     "evolvesTo": [
       "Toucannon"
     ]
@@ -5738,8 +5738,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 733,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/108_hires.png",
+    "nationalPokedexNumber": 733
   },
   {
     "id": "sm1-109",
@@ -5787,8 +5787,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 734,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/109_hires.png",
+    "nationalPokedexNumber": 734,
     "evolvesTo": [
       "Gumshoos"
     ]
@@ -5851,8 +5851,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 735,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/110_hires.png",
+    "nationalPokedexNumber": 735
   },
   {
     "id": "sm1-111",
@@ -5892,8 +5892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 759,
     "imageUrlHiRes": "https://images.pokemontcg.io/sm1/111_hires.png",
+    "nationalPokedexNumber": 759,
     "evolvesTo": [
       "Bewear"
     ]
@@ -5949,8 +5949,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 760,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/112_hires.png",
+    "nationalPokedexNumber": 760
   },
   {
     "id": "sm1-113",
@@ -5996,8 +5996,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 765,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/113_hires.png",
+    "nationalPokedexNumber": 765
   },
   {
     "id": "sm1-114",
@@ -6469,8 +6469,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 754,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/138_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/138_hires.png",
+    "nationalPokedexNumber": 754
   },
   {
     "id": "sm1-139",
@@ -6535,8 +6535,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/139_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/139_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "sm1-140",
@@ -6601,8 +6601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/140_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/140_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "sm1-141",
@@ -6671,8 +6671,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 792,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/141_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/141_hires.png",
+    "nationalPokedexNumber": 792
   },
   {
     "id": "sm1-142",
@@ -6743,8 +6743,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/142_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/142_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "sm1-143",
@@ -6811,8 +6811,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 791,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/143_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/143_hires.png",
+    "nationalPokedexNumber": 791
   },
   {
     "id": "sm1-144",
@@ -6877,8 +6877,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/144_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/144_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "sm1-145",
@@ -6938,8 +6938,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 735,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/145_hires.png",
+    "nationalPokedexNumber": 735
   },
   {
     "id": "sm1-146",
@@ -7071,8 +7071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 754,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/150_hires.png",
+    "nationalPokedexNumber": 754
   },
   {
     "id": "sm1-151",
@@ -7137,8 +7137,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/151_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/151_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "sm1-152",
@@ -7203,8 +7203,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/152_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/152_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "sm1-153",
@@ -7273,8 +7273,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 792,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/153_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/153_hires.png",
+    "nationalPokedexNumber": 792
   },
   {
     "id": "sm1-154",
@@ -7345,8 +7345,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/154_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/154_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "sm1-155",
@@ -7413,8 +7413,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 791,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/155_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/155_hires.png",
+    "nationalPokedexNumber": 791
   },
   {
     "id": "sm1-156",
@@ -7479,8 +7479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/156_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/156_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "sm1-157",
@@ -7540,8 +7540,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 735,
-    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/157_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/sm1/157_hires.png",
+    "nationalPokedexNumber": 735
   },
   {
     "id": "sm1-158",
diff --git a/json/cards/Supreme Victors.json b/json/cards/Supreme Victors.json
index 9ada9d894..209c5f23c 100644
--- a/json/cards/Supreme Victors.json	
+++ b/json/cards/Supreme Victors.json	
@@ -53,8 +53,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/1_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "pl3-2",
@@ -103,8 +103,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/2_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "pl3-3",
@@ -157,8 +157,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/3_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "pl3-4",
@@ -216,8 +216,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/4_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "pl3-5",
@@ -271,8 +271,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/5_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "pl3-6",
@@ -330,8 +330,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 467,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/6_hires.png",
+    "nationalPokedexNumber": 467
   },
   {
     "id": "pl3-7",
@@ -386,8 +386,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/7_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "pl3-8",
@@ -446,8 +446,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/8_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "pl3-9",
@@ -493,7 +493,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of different types of Pokémon SP you have in play."
       }
     ],
@@ -503,8 +503,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/9_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "pl3-10",
@@ -566,8 +566,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/10_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "pl3-11",
@@ -623,8 +623,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 398,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/11_hires.png",
+    "nationalPokedexNumber": 398
   },
   {
     "id": "pl3-12",
@@ -684,8 +684,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/12_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "pl3-13",
@@ -745,8 +745,8 @@
         "value": "+40"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/13_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "pl3-14",
@@ -807,8 +807,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/14_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "pl3-15",
@@ -855,8 +855,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/15_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "pl3-16",
@@ -916,8 +916,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/16_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "pl3-17",
@@ -969,8 +969,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 12,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/17_hires.png",
+    "nationalPokedexNumber": 12
   },
   {
     "id": "pl3-18",
@@ -1026,8 +1026,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/18_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "pl3-19",
@@ -1081,8 +1081,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/19_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "pl3-20",
@@ -1141,8 +1141,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/20_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "pl3-21",
@@ -1190,8 +1190,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 358,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/21_hires.png",
+    "nationalPokedexNumber": 358
   },
   {
     "id": "pl3-22",
@@ -1242,8 +1242,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/22_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "pl3-23",
@@ -1293,8 +1293,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/23_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "pl3-24",
@@ -1354,8 +1354,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 87,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/24_hires.png",
+    "nationalPokedexNumber": 87
   },
   {
     "id": "pl3-25",
@@ -1405,8 +1405,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/25_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "pl3-26",
@@ -1448,7 +1448,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon SP in your discard pile."
       }
     ],
@@ -1464,8 +1464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 477,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/26_hires.png",
+    "nationalPokedexNumber": 477
   },
   {
     "id": "pl3-27",
@@ -1517,8 +1517,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/27_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "pl3-28",
@@ -1576,8 +1576,8 @@
         "value": "+30"
       }
     ],
-    "nationalPokedexNumber": 295,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/28_hires.png",
+    "nationalPokedexNumber": 295
   },
   {
     "id": "pl3-29",
@@ -1630,8 +1630,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 430,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/29_hires.png",
+    "nationalPokedexNumber": 430
   },
   {
     "id": "pl3-30",
@@ -1682,8 +1682,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 463,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/30_hires.png",
+    "nationalPokedexNumber": 463
   },
   {
     "id": "pl3-31",
@@ -1734,8 +1734,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/31_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "pl3-32",
@@ -1777,8 +1777,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/32_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "pl3-33",
@@ -1843,8 +1843,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/33_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "pl3-34",
@@ -1896,8 +1896,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 308,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/34_hires.png",
+    "nationalPokedexNumber": 308
   },
   {
     "id": "pl3-35",
@@ -1947,8 +1947,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/35_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "pl3-36",
@@ -2007,8 +2007,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/36_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "pl3-37",
@@ -2047,8 +2047,8 @@
         "text": "If Mr. Mime already has 5 or more damage counters on it, this attack does 20 damage plus 40 more damage."
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/37_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "pl3-38",
@@ -2099,8 +2099,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 47,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/38_hires.png",
+    "nationalPokedexNumber": 47
   },
   {
     "id": "pl3-39",
@@ -2151,8 +2151,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/39_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "pl3-40",
@@ -2199,8 +2199,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/40_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "pl3-41",
@@ -2249,8 +2249,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/41_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "pl3-42",
@@ -2303,8 +2303,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/42_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "pl3-43",
@@ -2353,8 +2353,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 119,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/43_hires.png",
+    "nationalPokedexNumber": 119
   },
   {
     "id": "pl3-44",
@@ -2399,8 +2399,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 292,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/44_hires.png",
+    "nationalPokedexNumber": 292
   },
   {
     "id": "pl3-45",
@@ -2445,8 +2445,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/45_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "pl3-46",
@@ -2494,8 +2494,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 327,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/46_hires.png",
+    "nationalPokedexNumber": 327
   },
   {
     "id": "pl3-47",
@@ -2552,8 +2552,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 321,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/47_hires.png",
+    "nationalPokedexNumber": 321
   },
   {
     "id": "pl3-48",
@@ -2613,8 +2613,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/48_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "pl3-49",
@@ -2670,8 +2670,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/49_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "pl3-50",
@@ -2726,8 +2726,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/50_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "pl3-51",
@@ -2771,7 +2771,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2781,8 +2781,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 400,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/51_hires.png",
+    "nationalPokedexNumber": 400
   },
   {
     "id": "pl3-52",
@@ -2832,8 +2832,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 286,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/52_hires.png",
+    "nationalPokedexNumber": 286
   },
   {
     "id": "pl3-53",
@@ -2891,8 +2891,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 455,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/53_hires.png",
+    "nationalPokedexNumber": 455
   },
   {
     "id": "pl3-54",
@@ -2942,8 +2942,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/54_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/54_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "pl3-55",
@@ -2982,7 +2982,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 3 coins. This attack does 30 damage times the number of heads. Cherrim is now Confused."
       }
     ],
@@ -2998,8 +2998,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 421,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/55_hires.png",
+    "nationalPokedexNumber": 421
   },
   {
     "id": "pl3-56",
@@ -3060,8 +3060,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/56_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "pl3-57",
@@ -3119,8 +3119,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 426,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/57_hires.png",
+    "nationalPokedexNumber": 426
   },
   {
     "id": "pl3-58",
@@ -3172,8 +3172,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 419,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/58_hires.png",
+    "nationalPokedexNumber": 419
   },
   {
     "id": "pl3-59",
@@ -3223,8 +3223,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 444,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/59_hires.png",
+    "nationalPokedexNumber": 444,
     "evolvesTo": [
       "Garchomp"
     ]
@@ -3278,8 +3278,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/60_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "pl3-61",
@@ -3310,7 +3310,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -3331,8 +3331,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 449,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/61_hires.png",
+    "nationalPokedexNumber": 449,
     "evolvesTo": [
       "Hippowdon"
     ]
@@ -3383,8 +3383,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 2,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/62_hires.png",
+    "nationalPokedexNumber": 2,
     "evolvesTo": [
       "Venusaur"
     ]
@@ -3438,8 +3438,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 428,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/63_hires.png",
+    "nationalPokedexNumber": 428
   },
   {
     "id": "pl3-64",
@@ -3492,8 +3492,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 294,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/64_hires.png",
+    "nationalPokedexNumber": 294,
     "evolvesTo": [
       "Exploud"
     ]
@@ -3545,8 +3545,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/65_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -3604,8 +3604,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/66_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/66_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "pl3-67",
@@ -3652,8 +3652,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 259,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/67_hires.png",
+    "nationalPokedexNumber": 259,
     "evolvesTo": [
       "Swampert"
     ]
@@ -3704,8 +3704,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 284,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/68_hires.png",
+    "nationalPokedexNumber": 284
   },
   {
     "id": "pl3-69",
@@ -3759,8 +3759,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 375,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/69_hires.png",
+    "nationalPokedexNumber": 375,
     "evolvesTo": [
       "Metagross"
     ]
@@ -3815,8 +3815,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/70_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "pl3-71",
@@ -3870,8 +3870,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 312,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/71_hires.png",
+    "nationalPokedexNumber": 312
   },
   {
     "id": "pl3-72",
@@ -3926,8 +3926,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/72_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -3982,8 +3982,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 291,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/73_hires.png",
+    "nationalPokedexNumber": 291,
     "evolvesTo": [
       "Shedinja"
     ]
@@ -4037,8 +4037,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/74_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -4093,8 +4093,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 127,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/75_hires.png",
+    "nationalPokedexNumber": 127
   },
   {
     "id": "pl3-76",
@@ -4148,8 +4148,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 311,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/76_hires.png",
+    "nationalPokedexNumber": 311
   },
   {
     "id": "pl3-77",
@@ -4203,8 +4203,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/77_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "pl3-78",
@@ -4249,8 +4249,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/78_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "pl3-79",
@@ -4299,8 +4299,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/79_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "pl3-80",
@@ -4332,7 +4332,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 3 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -4359,8 +4359,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/80_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -4415,8 +4415,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 407,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/81_hires.png",
+    "nationalPokedexNumber": 407
   },
   {
     "id": "pl3-82",
@@ -4445,7 +4445,7 @@
           "Lightning"
         ],
         "convertedEnergyCost": 1,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Discard all Lightning Energy attached to Rotom. Flip a coin for each Energy card you discarded. This attack does 40 damage times the number of heads."
       },
       {
@@ -4471,8 +4471,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 479,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/82_hires.png",
+    "nationalPokedexNumber": 479
   },
   {
     "id": "pl3-83",
@@ -4527,8 +4527,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/83_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "pl3-84",
@@ -4577,8 +4577,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 442,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/84_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/84_hires.png",
+    "nationalPokedexNumber": 442
   },
   {
     "id": "pl3-85",
@@ -4609,7 +4609,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       },
       {
@@ -4636,8 +4636,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 397,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/85_hires.png",
+    "nationalPokedexNumber": 397,
     "evolvesTo": [
       "Staraptor"
     ]
@@ -4692,8 +4692,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 468,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/86_hires.png",
+    "nationalPokedexNumber": 468
   },
   {
     "id": "pl3-87",
@@ -4746,8 +4746,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 320,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/87_hires.png",
+    "nationalPokedexNumber": 320,
     "evolvesTo": [
       "Wailord"
     ]
@@ -4804,8 +4804,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/88_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -4847,7 +4847,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -4857,8 +4857,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/89_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -4916,8 +4916,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 374,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/90_hires.png",
+    "nationalPokedexNumber": 374,
     "evolvesTo": [
       "Metang"
     ]
@@ -4960,8 +4960,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/91_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -5013,8 +5013,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 418,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/92_hires.png",
+    "nationalPokedexNumber": 418,
     "evolvesTo": [
       "Floatzel"
     ]
@@ -5066,8 +5066,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/93_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -5119,8 +5119,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 427,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/94_hires.png",
+    "nationalPokedexNumber": 427,
     "evolvesTo": [
       "Lopunny"
     ]
@@ -5178,8 +5178,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 441,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/95_hires.png",
+    "nationalPokedexNumber": 441
   },
   {
     "id": "pl3-96",
@@ -5233,8 +5233,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 420,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/96_hires.png",
+    "nationalPokedexNumber": 420,
     "evolvesTo": [
       "Cherrim"
     ]
@@ -5286,8 +5286,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 390,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/97_hires.png",
+    "nationalPokedexNumber": 390,
     "evolvesTo": [
       "Monferno"
     ]
@@ -5334,8 +5334,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 433,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/98_hires.png",
+    "nationalPokedexNumber": 433,
     "evolvesTo": [
       "Chimecho"
     ]
@@ -5393,8 +5393,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 415,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/99_hires.png",
+    "nationalPokedexNumber": 415,
     "evolvesTo": [
       "Vespiquen"
     ]
@@ -5445,8 +5445,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/100_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -5498,8 +5498,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 453,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/101_hires.png",
+    "nationalPokedexNumber": 453,
     "evolvesTo": [
       "Toxicroak"
     ]
@@ -5544,8 +5544,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/102_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -5602,8 +5602,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 425,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/103_hires.png",
+    "nationalPokedexNumber": 425,
     "evolvesTo": [
       "Drifblim"
     ]
@@ -5654,8 +5654,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 349,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/104_hires.png",
+    "nationalPokedexNumber": 349,
     "evolvesTo": [
       "Milotic"
     ]
@@ -5708,8 +5708,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 74,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/105_hires.png",
+    "nationalPokedexNumber": 74,
     "evolvesTo": [
       "Graveler"
     ]
@@ -5760,8 +5760,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 443,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/106_hires.png",
+    "nationalPokedexNumber": 443,
     "evolvesTo": [
       "Gabite"
     ]
@@ -5793,7 +5793,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Goldeen."
       },
       {
@@ -5802,7 +5802,7 @@
           "Water"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -5812,8 +5812,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 118,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/107_hires.png",
+    "nationalPokedexNumber": 118,
     "evolvesTo": [
       "Seaking"
     ]
@@ -5866,8 +5866,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 58,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/108_hires.png",
+    "nationalPokedexNumber": 58,
     "evolvesTo": [
       "Arcanine"
     ]
@@ -5919,8 +5919,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 401,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/109_hires.png",
+    "nationalPokedexNumber": 401,
     "evolvesTo": [
       "Kricketune"
     ]
@@ -5952,7 +5952,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -5962,8 +5962,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/110_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -6021,8 +6021,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/111_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -6064,8 +6064,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/112_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -6117,8 +6117,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 307,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/113_hires.png",
+    "nationalPokedexNumber": 307,
     "evolvesTo": [
       "Medicham"
     ]
@@ -6161,7 +6161,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -6171,8 +6171,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/114_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -6219,8 +6219,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 439,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/115_hires.png",
+    "nationalPokedexNumber": 439
   },
   {
     "id": "pl3-116",
@@ -6269,8 +6269,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/116_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -6321,8 +6321,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 290,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/117_hires.png",
+    "nationalPokedexNumber": 290,
     "evolvesTo": [
       "Ninjask"
     ]
@@ -6379,8 +6379,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 417,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/118_hires.png",
+    "nationalPokedexNumber": 417
   },
   {
     "id": "pl3-119",
@@ -6428,8 +6428,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 46,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/119_hires.png",
+    "nationalPokedexNumber": 46,
     "evolvesTo": [
       "Parasect"
     ]
@@ -6487,8 +6487,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/120_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -6540,8 +6540,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 393,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/121_hires.png",
+    "nationalPokedexNumber": 393,
     "evolvesTo": [
       "Prinplup"
     ]
@@ -6602,8 +6602,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/122_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -6655,8 +6655,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 315,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/123_hires.png",
+    "nationalPokedexNumber": 315,
     "evolvesTo": [
       "Roserade"
     ]
@@ -6704,8 +6704,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/124_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -6758,8 +6758,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 86,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/125_hires.png",
+    "nationalPokedexNumber": 86,
     "evolvesTo": [
       "Dewgong"
     ]
@@ -6808,8 +6808,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 403,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/126_hires.png",
+    "nationalPokedexNumber": 403,
     "evolvesTo": [
       "Luxio"
     ]
@@ -6867,8 +6867,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 285,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/127_hires.png",
+    "nationalPokedexNumber": 285,
     "evolvesTo": [
       "Breloom"
     ]
@@ -6923,8 +6923,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 451,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/128_hires.png",
+    "nationalPokedexNumber": 451,
     "evolvesTo": [
       "Drapion"
     ]
@@ -6973,8 +6973,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 396,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/129_hires.png",
+    "nationalPokedexNumber": 396,
     "evolvesTo": [
       "Staravia"
     ]
@@ -7016,8 +7016,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 283,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/130_hires.png",
+    "nationalPokedexNumber": 283,
     "evolvesTo": [
       "Masquerain"
     ]
@@ -7077,8 +7077,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 387,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/131_hires.png",
+    "nationalPokedexNumber": 387,
     "evolvesTo": [
       "Grotle"
     ]
@@ -7130,8 +7130,8 @@
         "value": "+10"
       }
     ],
-    "nationalPokedexNumber": 293,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/132_hires.png",
+    "nationalPokedexNumber": 293,
     "evolvesTo": [
       "Loudred"
     ]
@@ -7163,7 +7163,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -7179,8 +7179,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/133_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -7366,8 +7366,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/141_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/141_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "pl3-142",
@@ -7415,8 +7415,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/142_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/142_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "pl3-143",
@@ -7475,8 +7475,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/143_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/143_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "pl3-144",
@@ -7533,8 +7533,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 466,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/144_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/144_hires.png",
+    "nationalPokedexNumber": 466
   },
   {
     "id": "pl3-145",
@@ -7580,8 +7580,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/145_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "pl3-146",
@@ -7639,8 +7639,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/146_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "pl3-147",
@@ -7692,8 +7692,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 398,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/147_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/147_hires.png",
+    "nationalPokedexNumber": 398
   },
   {
     "id": "pl3-148",
@@ -7734,8 +7734,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/148_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/148_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "pl3-149",
@@ -7776,8 +7776,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/149_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/149_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "pl3-150",
@@ -7818,8 +7818,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/150_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "pl3-SH7",
@@ -7866,8 +7866,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 350,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/SH7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/SH7_hires.png",
+    "nationalPokedexNumber": 350
   },
   {
     "id": "pl3-SH8",
@@ -7918,8 +7918,8 @@
         "value": "+20"
       }
     ],
-    "nationalPokedexNumber": 369,
-    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/SH8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/pl3/SH8_hires.png",
+    "nationalPokedexNumber": 369
   },
   {
     "id": "pl3-SH9",
@@ -7975,8 +7975,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl3/SH9_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
diff --git a/json/cards/Team Magma vs Team Aqua.json b/json/cards/Team Magma vs Team Aqua.json
index d22a477ba..d3ebe4230 100644
--- a/json/cards/Team Magma vs Team Aqua.json	
+++ b/json/cards/Team Magma vs Team Aqua.json	
@@ -48,8 +48,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 332,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/1_hires.png",
+    "nationalPokedexNumber": 332
   },
   {
     "id": "ex4-2",
@@ -100,8 +100,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/2_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "ex4-3",
@@ -159,8 +159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/3_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "ex4-4",
@@ -212,8 +212,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/4_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex4-5",
@@ -261,8 +261,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/5_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "ex4-6",
@@ -318,8 +318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 365,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/6_hires.png",
+    "nationalPokedexNumber": 365
   },
   {
     "id": "ex4-7",
@@ -349,7 +349,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin for each Energy attached to Team Magma's Aggron. This attack does 30 damage times the number of heads."
       },
       {
@@ -375,8 +375,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 306,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/7_hires.png",
+    "nationalPokedexNumber": 306
   },
   {
     "id": "ex4-8",
@@ -423,8 +423,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/8_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex4-9",
@@ -482,8 +482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/9_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "ex4-10",
@@ -524,7 +524,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Discard the top 5 cards from your deck. This attack does 30 damage times the number of Fire and Fighting basic Energy cards discarded in this way."
       }
     ],
@@ -534,8 +534,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/10_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ex4-11",
@@ -587,8 +587,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/11_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -641,8 +641,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 324,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/12_hires.png",
+    "nationalPokedexNumber": 324
   },
   {
     "id": "ex4-13",
@@ -692,8 +692,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/13_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "ex4-14",
@@ -743,8 +743,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 342,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/14_hires.png",
+    "nationalPokedexNumber": 342
   },
   {
     "id": "ex4-15",
@@ -800,8 +800,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/15_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex4-16",
@@ -849,8 +849,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/16_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -903,8 +903,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 336,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/17_hires.png",
+    "nationalPokedexNumber": 336
   },
   {
     "id": "ex4-18",
@@ -951,8 +951,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 319,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/18_hires.png",
+    "nationalPokedexNumber": 319
   },
   {
     "id": "ex4-19",
@@ -998,8 +998,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 323,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/19_hires.png",
+    "nationalPokedexNumber": 323
   },
   {
     "id": "ex4-20",
@@ -1049,8 +1049,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/20_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -1108,8 +1108,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/21_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex4-22",
@@ -1160,8 +1160,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/22_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -1203,7 +1203,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play with Team Magma in its name."
       }
     ],
@@ -1213,8 +1213,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 335,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/23_hires.png",
+    "nationalPokedexNumber": 335
   },
   {
     "id": "ex4-24",
@@ -1253,7 +1253,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -1263,8 +1263,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 331,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/24_hires.png",
+    "nationalPokedexNumber": 331,
     "evolvesTo": [
       "Cacturne"
     ]
@@ -1311,8 +1311,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/25_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -1343,7 +1343,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -1363,8 +1363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/26_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -1421,8 +1421,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/27_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -1476,8 +1476,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/28_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ex4-29",
@@ -1533,8 +1533,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 310,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/29_hires.png",
+    "nationalPokedexNumber": 310
   },
   {
     "id": "ex4-30",
@@ -1588,8 +1588,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/30_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex4-31",
@@ -1640,8 +1640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 364,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/31_hires.png",
+    "nationalPokedexNumber": 364,
     "evolvesTo": [
       "Walrein"
     ]
@@ -1692,8 +1692,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/32_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -1746,8 +1746,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 344,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/33_hires.png",
+    "nationalPokedexNumber": 344
   },
   {
     "id": "ex4-34",
@@ -1797,8 +1797,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/34_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ex4-35",
@@ -1846,8 +1846,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/35_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -1899,8 +1899,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 305,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/36_hires.png",
+    "nationalPokedexNumber": 305,
     "evolvesTo": [
       "Aggron"
     ]
@@ -1953,8 +1953,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 262,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/37_hires.png",
+    "nationalPokedexNumber": 262
   },
   {
     "id": "ex4-38",
@@ -2003,8 +2003,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/38_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -2054,8 +2054,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 1,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/39_hires.png",
+    "nationalPokedexNumber": 1,
     "evolvesTo": [
       "Ivysaur"
     ]
@@ -2096,8 +2096,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/40_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -2128,7 +2128,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -2148,8 +2148,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/41_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -2200,8 +2200,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/42_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -2252,8 +2252,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/43_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -2303,8 +2303,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/44_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -2355,8 +2355,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/45_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -2403,8 +2403,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/46_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -2455,8 +2455,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/47_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -2507,8 +2507,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 318,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/48_hires.png",
+    "nationalPokedexNumber": 318,
     "evolvesTo": [
       "Sharpedo"
     ]
@@ -2565,8 +2565,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/49_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2587,6 +2587,9 @@
     "series": "EX",
     "set": "Team Magma vs Team Aqua",
     "setCode": "ex4",
+    "types": [
+      "Water"
+    ],
     "attacks": [
       {
         "name": "Toxic Grip",
@@ -2604,11 +2607,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Water"
-    ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/50_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -2659,8 +2659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 341,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/51_hires.png",
+    "nationalPokedexNumber": 341,
     "evolvesTo": [
       "Crawdaunt"
     ]
@@ -2717,8 +2717,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/52_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2775,8 +2775,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 309,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/53_hires.png",
+    "nationalPokedexNumber": 309,
     "evolvesTo": [
       "Manectric"
     ]
@@ -2807,7 +2807,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -2833,8 +2833,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/54_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -2891,8 +2891,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/55_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -2933,8 +2933,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/56_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -2985,8 +2985,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 363,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/57_hires.png",
+    "nationalPokedexNumber": 363,
     "evolvesTo": [
       "Sealeo"
     ]
@@ -3037,8 +3037,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/58_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -3079,8 +3079,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 304,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/59_hires.png",
+    "nationalPokedexNumber": 304,
     "evolvesTo": [
       "Lairon"
     ]
@@ -3121,7 +3121,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip 2 coins. This attack does 20 damage times the number of heads."
       }
     ],
@@ -3131,8 +3131,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/60_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -3183,8 +3183,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 343,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/61_hires.png",
+    "nationalPokedexNumber": 343,
     "evolvesTo": [
       "Claydol"
     ]
@@ -3235,8 +3235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/62_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3287,8 +3287,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/63_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3339,8 +3339,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 322,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/64_hires.png",
+    "nationalPokedexNumber": 322,
     "evolvesTo": [
       "Camerupt"
     ]
@@ -3387,8 +3387,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/65_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3445,8 +3445,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 261,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/66_hires.png",
+    "nationalPokedexNumber": 261,
     "evolvesTo": [
       "Mightyena"
     ]
@@ -3477,7 +3477,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       },
       {
@@ -3497,8 +3497,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/67_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3550,8 +3550,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex4/68_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3982,8 +3982,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/89_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "ex4-90",
@@ -4048,8 +4048,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 346,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/90_hires.png",
+    "nationalPokedexNumber": 346
   },
   {
     "id": "ex4-91",
@@ -4103,8 +4103,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/91_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "ex4-92",
@@ -4158,8 +4158,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/92_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "ex4-93",
@@ -4236,8 +4236,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 254,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/93_hires.png",
+    "nationalPokedexNumber": 254
   },
   {
     "id": "ex4-94",
@@ -4291,8 +4291,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/94_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "ex4-95",
@@ -4347,7 +4347,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex4/95_hires.png",
+    "nationalPokedexNumber": 260
   }
 ]
diff --git a/json/cards/Team Rocket Returns.json b/json/cards/Team Rocket Returns.json
index 990b9166a..c44732acb 100644
--- a/json/cards/Team Rocket Returns.json	
+++ b/json/cards/Team Rocket Returns.json	
@@ -42,8 +42,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 184,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/1_hires.png",
+    "nationalPokedexNumber": 184
   },
   {
     "id": "ex7-2",
@@ -101,8 +101,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/2_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ex7-3",
@@ -164,8 +164,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/3_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "ex7-4",
@@ -210,8 +210,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/4_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "ex7-5",
@@ -277,8 +277,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/5_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ex7-6",
@@ -318,7 +318,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Does 20 damage times the number of your opponent's Benched Pokémon."
       }
     ],
@@ -328,8 +328,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/6_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "ex7-7",
@@ -381,8 +381,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 105,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/7_hires.png",
+    "nationalPokedexNumber": 105
   },
   {
     "id": "ex7-8",
@@ -432,8 +432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/8_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "ex7-9",
@@ -479,8 +479,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/9_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "ex7-10",
@@ -542,8 +542,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/10_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ex7-11",
@@ -590,8 +590,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 189,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/11_hires.png",
+    "nationalPokedexNumber": 189
   },
   {
     "id": "ex7-12",
@@ -648,8 +648,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/12_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "ex7-13",
@@ -702,8 +702,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 221,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/13_hires.png",
+    "nationalPokedexNumber": 221,
     "evolvesTo": [
       "Mamoswine"
     ]
@@ -768,8 +768,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 176,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/14_hires.png",
+    "nationalPokedexNumber": 176,
     "evolvesTo": [
       "Togekiss"
     ]
@@ -839,8 +839,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/15_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "ex7-16",
@@ -876,7 +876,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Colorless Energy in the Defending Pokémon's Retreat Cost (after applying effects to the Retreat Cost).\""
       },
       {
@@ -896,8 +896,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/16_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "ex7-17",
@@ -943,8 +943,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/17_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "ex7-18",
@@ -988,8 +988,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 28,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/18_hires.png",
+    "nationalPokedexNumber": 28
   },
   {
     "id": "ex7-19",
@@ -1059,8 +1059,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/19_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ex7-20",
@@ -1109,8 +1109,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/20_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ex7-21",
@@ -1154,8 +1154,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 225,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/21_hires.png",
+    "nationalPokedexNumber": 225
   },
   {
     "id": "ex7-22",
@@ -1204,8 +1204,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 162,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/22_hires.png",
+    "nationalPokedexNumber": 162
   },
   {
     "id": "ex7-23",
@@ -1261,8 +1261,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/23_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "ex7-24",
@@ -1305,8 +1305,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 240,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/24_hires.png",
+    "nationalPokedexNumber": 240,
     "evolvesTo": [
       "Magmar"
     ]
@@ -1359,8 +1359,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/25_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -1408,8 +1408,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/26_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "ex7-27",
@@ -1453,8 +1453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 211,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/27_hires.png",
+    "nationalPokedexNumber": 211
   },
   {
     "id": "ex7-28",
@@ -1507,8 +1507,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/28_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -1561,8 +1561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/29_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "ex7-30",
@@ -1613,8 +1613,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/30_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "ex7-31",
@@ -1669,8 +1669,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/31_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1739,8 +1739,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/32_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1793,8 +1793,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/33_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -1834,8 +1834,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/34_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1890,8 +1890,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/35_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "ex7-36",
@@ -1950,8 +1950,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/36_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "ex7-37",
@@ -1998,8 +1998,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/37_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ex7-38",
@@ -2051,8 +2051,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/38_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ex7-39",
@@ -2104,8 +2104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/39_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -2158,8 +2158,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/40_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2215,8 +2215,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/41_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -2276,8 +2276,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/42_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "ex7-43",
@@ -2321,8 +2321,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 214,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/43_hires.png",
+    "nationalPokedexNumber": 214
   },
   {
     "id": "ex7-44",
@@ -2371,8 +2371,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/44_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2419,8 +2419,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 226,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/45_hires.png",
+    "nationalPokedexNumber": 226
   },
   {
     "id": "ex7-46",
@@ -2458,7 +2458,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip a coin for each Pokémon in play (both yours and your opponent's). This attack does 10 damage times the number of heads. Rocket's Meowth does 10 damage times the number of tails to itself."
       }
     ],
@@ -2468,8 +2468,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/46_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -2520,8 +2520,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/47_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "ex7-48",
@@ -2572,8 +2572,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 117,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/48_hires.png",
+    "nationalPokedexNumber": 117,
     "evolvesTo": [
       "Kingdra"
     ]
@@ -2623,8 +2623,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 188,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/49_hires.png",
+    "nationalPokedexNumber": 188,
     "evolvesTo": [
       "Jumpluff"
     ]
@@ -2675,8 +2675,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/50_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -2716,7 +2716,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 2 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -2726,8 +2726,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 104,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/51_hires.png",
+    "nationalPokedexNumber": 104,
     "evolvesTo": [
       "Marowak"
     ]
@@ -2762,8 +2762,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/52_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2824,8 +2824,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/53_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2871,8 +2871,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/54_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -2913,8 +2913,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/55_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -2935,6 +2935,9 @@
     "series": "EX",
     "set": "Team Rocket Returns",
     "setCode": "ex7",
+    "types": [
+      "Grass"
+    ],
     "attacks": [
       {
         "name": "Taunt",
@@ -2962,11 +2965,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Grass"
-    ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/56_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -3018,8 +3018,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 187,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/57_hires.png",
+    "nationalPokedexNumber": 187,
     "evolvesTo": [
       "Skiploom"
     ]
@@ -3070,8 +3070,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 116,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/58_hires.png",
+    "nationalPokedexNumber": 116,
     "evolvesTo": [
       "Seadra"
     ]
@@ -3122,8 +3122,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/59_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3169,8 +3169,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/60_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3216,8 +3216,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/61_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3249,7 +3249,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3259,8 +3259,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/62_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -3311,8 +3311,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/63_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -3363,8 +3363,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/64_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -3405,8 +3405,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/65_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -3447,8 +3447,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/66_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3499,8 +3499,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/67_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3541,8 +3541,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/68_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -3595,8 +3595,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/69_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3646,8 +3646,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/70_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -3683,7 +3683,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3693,8 +3693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/71_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -3744,8 +3744,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/72_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -3795,8 +3795,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/73_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -3847,8 +3847,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 27,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/74_hires.png",
+    "nationalPokedexNumber": 27,
     "evolvesTo": [
       "Sandslash"
     ]
@@ -3898,8 +3898,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 161,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/75_hires.png",
+    "nationalPokedexNumber": 161,
     "evolvesTo": [
       "Furret"
     ]
@@ -3945,8 +3945,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/76_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -3999,8 +3999,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/77_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -4051,8 +4051,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/78_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -4103,8 +4103,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 220,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/79_hires.png",
+    "nationalPokedexNumber": 220,
     "evolvesTo": [
       "Piloswine"
     ]
@@ -4154,8 +4154,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/80_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -4201,8 +4201,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/81_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -4253,8 +4253,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/82_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -4556,8 +4556,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/96_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "ex7-97",
@@ -4612,8 +4612,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/97_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "ex7-98",
@@ -4668,8 +4668,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/98_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "ex7-99",
@@ -4732,8 +4732,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/99_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "ex7-100",
@@ -4790,8 +4790,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/100_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "ex7-101",
@@ -4844,8 +4844,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/101_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "ex7-102",
@@ -4906,8 +4906,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/102_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -4966,8 +4966,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 215,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/103_hires.png",
+    "nationalPokedexNumber": 215,
     "evolvesTo": [
       "Weavile"
     ]
@@ -5029,8 +5029,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/104_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "ex7-105",
@@ -5085,8 +5085,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/105_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "ex7-106",
@@ -5141,8 +5141,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex7/106_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "ex7-107",
@@ -5190,8 +5190,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/107_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -5242,8 +5242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/108_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -5300,8 +5300,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex7/109_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
diff --git a/json/cards/Team Rocket.json b/json/cards/Team Rocket.json
index 7865d1f39..605265de6 100644
--- a/json/cards/Team Rocket.json	
+++ b/json/cards/Team Rocket.json	
@@ -52,8 +52,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/1_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "base5-2",
@@ -106,8 +106,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/2_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "base5-3",
@@ -140,7 +140,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30+",
-        "text": "Does 30 damage plus 20 more damage for each Energy attached to Dark Blastoise but not used to pay for this attack. You can't add more than 40 damage in this way."
+        "text": "Does 30 damage plus 20 more damage for each W Energy attached to Dark Blastoise but not used to pay for this attack. You can't add more than 40 damage in this way."
       },
       {
         "name": "Rocket Tackle",
@@ -160,8 +160,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/3_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "base5-4",
@@ -219,8 +219,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/4_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "base5-5",
@@ -269,8 +269,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/5_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "base5-6",
@@ -323,8 +323,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/6_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "base5-7",
@@ -373,8 +373,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/7_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -387,6 +387,11 @@
     "supertype": "Pokémon",
     "level": "31",
     "evolvesFrom": "Magikarp",
+    "ability": {
+      "name": "Final Beam",
+      "text": "When Dark Gyarados is Knocked Out by an attack, flip a coin. If heads, this power does 20 damage for each Water Energy attached to Dark Gyarados to the Pokémon that Knocked Out Dark Gyarados. Apply Weakness and Resistance. This power doesn't work if Dark Gyarados is Asleep, Confused, or Paralyzed.",
+      "type": "Pokémon Power"
+    },
     "hp": "70",
     "retreatCost": [
       "Colorless",
@@ -426,8 +431,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/8_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "base5-9",
@@ -479,8 +484,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/9_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "base5-10",
@@ -535,8 +540,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/10_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "base5-11",
@@ -588,8 +593,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/11_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -639,8 +644,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/12_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "base5-13",
@@ -688,8 +693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/13_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "base5-14",
@@ -741,8 +746,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/14_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "base5-15",
@@ -848,8 +853,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 65,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/18_hires.png",
+    "nationalPokedexNumber": 65
   },
   {
     "id": "base5-19",
@@ -902,8 +907,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/19_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "base5-20",
@@ -936,7 +941,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "30+",
-        "text": "Does 30 damage plus 20 more damage for each Energy attached to Dark Blastoise but not used to pay for this attack. You can't add more than 40 damage in this way."
+        "text": "Does 30 damage plus 20 more damage for each W Energy attached to Dark Blastoise but not used to pay for this attack. You can't add more than 40 damage in this way."
       },
       {
         "name": "Rocket Tackle",
@@ -956,8 +961,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/20_hires.png",
+    "nationalPokedexNumber": 9
   },
   {
     "id": "base5-21",
@@ -1015,8 +1020,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 6,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/21_hires.png",
+    "nationalPokedexNumber": 6
   },
   {
     "id": "base5-22",
@@ -1065,8 +1070,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/22_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "base5-23",
@@ -1119,8 +1124,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/23_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "base5-24",
@@ -1169,8 +1174,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 42,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/24_hires.png",
+    "nationalPokedexNumber": 42,
     "evolvesTo": [
       "Crobat"
     ]
@@ -1227,8 +1232,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/25_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "base5-26",
@@ -1280,8 +1285,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 97,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/26_hires.png",
+    "nationalPokedexNumber": 97
   },
   {
     "id": "base5-27",
@@ -1336,8 +1341,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/27_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "base5-28",
@@ -1389,8 +1394,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 82,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/28_hires.png",
+    "nationalPokedexNumber": 82,
     "evolvesTo": [
       "Magnezone"
     ]
@@ -1440,8 +1445,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/29_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "base5-30",
@@ -1485,12 +1490,12 @@
     ],
     "weaknesses": [
       {
-        "type": "Fighting",
+        "type": "Fire",
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 45,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/30_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/30_hires.png",
+    "nationalPokedexNumber": 45
   },
   {
     "id": "base5-31",
@@ -1522,7 +1527,7 @@
         ],
         "convertedEnergyCost": 2,
         "damage": "20×",
-        "text": "Does 20 damage times the total number of Koffings, Weezings, and Dark Weezings in play (Apply Weakness and Resistance.). Then, this attack does 20 damage to each Koffing, Weezing, and Dark Weezing even your own). Don't apply Weakness and Resistance."
+        "text": "Does 20 damage times the total number of Koffings, Weezings, and Dark Weezings in play (Apply Weakness and Resistance.). Then, this attack does 20 damage to each Koffing, Weezing, and Dark Weezing (even your own). Don't apply Weakness and Resistance."
       },
       {
         "name": "Stun Gas",
@@ -1542,8 +1547,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 110,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/31_hires.png",
+    "nationalPokedexNumber": 110
   },
   {
     "id": "base5-32",
@@ -1596,8 +1601,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 5,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/32_hires.png",
+    "nationalPokedexNumber": 5,
     "evolvesTo": [
       "Charizard"
     ]
@@ -1648,8 +1653,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 148,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/33_hires.png",
+    "nationalPokedexNumber": 148,
     "evolvesTo": [
       "Dragonite"
     ]
@@ -1702,8 +1707,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/34_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "base5-35",
@@ -1753,8 +1758,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/35_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "base5-36",
@@ -1801,8 +1806,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/36_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -1858,8 +1863,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 55,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/37_hires.png",
+    "nationalPokedexNumber": 55
   },
   {
     "id": "base5-38",
@@ -1910,8 +1915,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/38_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "base5-39",
@@ -1958,8 +1963,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 64,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/39_hires.png",
+    "nationalPokedexNumber": 64,
     "evolvesTo": [
       "Alakazam"
     ]
@@ -2016,8 +2021,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 67,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/40_hires.png",
+    "nationalPokedexNumber": 67,
     "evolvesTo": [
       "Machamp"
     ]
@@ -2067,8 +2072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 89,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/41_hires.png",
+    "nationalPokedexNumber": 89
   },
   {
     "id": "base5-42",
@@ -2121,8 +2126,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/42_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "base5-43",
@@ -2168,8 +2173,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 57,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/43_hires.png",
+    "nationalPokedexNumber": 57
   },
   {
     "id": "base5-44",
@@ -2217,8 +2222,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/44_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "base5-45",
@@ -2271,8 +2276,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/45_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "base5-46",
@@ -2322,8 +2327,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 8,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/46_hires.png",
+    "nationalPokedexNumber": 8,
     "evolvesTo": [
       "Blastoise"
     ]
@@ -2376,8 +2381,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/47_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -2438,8 +2443,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/48_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -2490,8 +2495,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/49_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -2538,8 +2543,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 4,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/50_hires.png",
+    "nationalPokedexNumber": 4,
     "evolvesTo": [
       "Charmeleon"
     ]
@@ -2600,8 +2605,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 20,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/51_hires.png",
+    "nationalPokedexNumber": 20
   },
   {
     "id": "base5-52",
@@ -2653,8 +2658,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/52_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -2697,8 +2702,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 147,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/53_hires.png",
+    "nationalPokedexNumber": 147,
     "evolvesTo": [
       "Dragonair"
     ]
@@ -2711,7 +2716,7 @@
     "supertype": "Pokémon",
     "level": "10",
     "ability": {
-      "name": "Long",
+      "name": "Long Distance Hypnosis",
       "text": "Distance Hypnosis - Once during your turn (before your attack), you may flip a coin. If heads, the Defending Pokémon is now Asleep; if tails, your Active Pokémon is now Asleep. The power can't be used if Drowzee is Asleep, Confused, or Paralyzed.",
       "type": "Pokémon Power"
     },
@@ -2746,8 +2751,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 96,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/54_hires.png",
+    "nationalPokedexNumber": 96,
     "evolvesTo": [
       "Hypno"
     ]
@@ -2805,8 +2810,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/55_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2865,8 +2870,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/56_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -2918,8 +2923,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 88,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/57_hires.png",
+    "nationalPokedexNumber": 88,
     "evolvesTo": [
       "Muk"
     ]
@@ -2971,8 +2976,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 109,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/58_hires.png",
+    "nationalPokedexNumber": 109,
     "evolvesTo": [
       "Weezing"
     ]
@@ -3026,8 +3031,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 66,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/59_hires.png",
+    "nationalPokedexNumber": 66,
     "evolvesTo": [
       "Machoke"
     ]
@@ -3080,8 +3085,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 81,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/60_hires.png",
+    "nationalPokedexNumber": 81,
     "evolvesTo": [
       "Magneton"
     ]
@@ -3130,8 +3135,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 56,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/61_hires.png",
+    "nationalPokedexNumber": 56,
     "evolvesTo": [
       "Primeape"
     ]
@@ -3180,8 +3185,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/62_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -3232,8 +3237,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/63_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3276,8 +3281,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 77,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/64_hires.png",
+    "nationalPokedexNumber": 77,
     "evolvesTo": [
       "Rapidash"
     ]
@@ -3329,8 +3334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/65_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -3380,8 +3385,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 19,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/66_hires.png",
+    "nationalPokedexNumber": 19,
     "evolvesTo": [
       "Raticate"
     ]
@@ -3432,8 +3437,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/67_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -3477,8 +3482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 7,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/68_hires.png",
+    "nationalPokedexNumber": 7,
     "evolvesTo": [
       "Wartortle"
     ]
@@ -3520,8 +3525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/69_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -3576,8 +3581,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 41,
     "imageUrlHiRes": "https://images.pokemontcg.io/base5/70_hires.png",
+    "nationalPokedexNumber": 41,
     "evolvesTo": [
       "Golbat"
     ]
@@ -3826,7 +3831,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/base5/83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/base5/83_hires.png",
+    "nationalPokedexNumber": 26
   }
 ]
diff --git a/json/cards/Ultra Prism.json b/json/cards/Ultra Prism.json
index 55752db56..0cbc690e2 100644
--- a/json/cards/Ultra Prism.json	
+++ b/json/cards/Ultra Prism.json	
@@ -1349,7 +1349,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage for each heads."
       }
@@ -1392,7 +1392,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "30",
         "text": "During your opponent's next turn, if this Pokémon is damaged by an attack (even if this Pokémon is Knocked Out), put 6 damage counters on the Attacking Pokémon."
       },
@@ -1442,7 +1442,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "Your opponent switches their Active Pokémon with 1 of their Benched Pokémon."
       },
@@ -3920,7 +3920,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "10×",
         "text": "Flip a coin until you get tails. This attack does 10 damage for each heads."
       }
@@ -3969,7 +3969,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "30×",
         "text": "Discard any number of Metal Energy cards from your hand. This attack does 30 damage for each card you discarded in this way."
       }
@@ -4892,7 +4892,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "For each of your Benched Exeggcute, search your deck for an Alolan Exeggutor or Alolan Exeggutor-GX and put it onto that Exeggcute to evolve it. Then, shuffle your deck."
       },
@@ -7205,4 +7205,4 @@
     ],
     "imageUrlHiRes": "https://images.pokemontcg.io/sm5/156_hires.png"
   }
-]
\ No newline at end of file
+]
diff --git a/json/cards/Unseen Forces.json b/json/cards/Unseen Forces.json
index 499f16411..46f9dde0d 100644
--- a/json/cards/Unseen Forces.json	
+++ b/json/cards/Unseen Forces.json	
@@ -50,8 +50,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 181,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/1_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/1_hires.png",
+    "nationalPokedexNumber": 181
   },
   {
     "id": "ex10-2",
@@ -99,8 +99,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 168,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/2_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/2_hires.png",
+    "nationalPokedexNumber": 168
   },
   {
     "id": "ex10-3",
@@ -156,8 +156,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 182,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/3_hires.png",
+    "nationalPokedexNumber": 182
   },
   {
     "id": "ex10-4",
@@ -214,8 +214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/4_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/4_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "ex10-5",
@@ -265,8 +265,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 136,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/5_hires.png",
+    "nationalPokedexNumber": 136
   },
   {
     "id": "ex10-6",
@@ -324,8 +324,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 205,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/6_hires.png",
+    "nationalPokedexNumber": 205
   },
   {
     "id": "ex10-7",
@@ -381,8 +381,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 229,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/7_hires.png",
+    "nationalPokedexNumber": 229
   },
   {
     "id": "ex10-8",
@@ -435,8 +435,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 135,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/8_hires.png",
+    "nationalPokedexNumber": 135
   },
   {
     "id": "ex10-9",
@@ -490,8 +490,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/9_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "ex10-10",
@@ -545,8 +545,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 224,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/10_hires.png",
+    "nationalPokedexNumber": 224
   },
   {
     "id": "ex10-11",
@@ -603,8 +603,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 62,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/11_hires.png",
+    "nationalPokedexNumber": 62
   },
   {
     "id": "ex10-12",
@@ -659,8 +659,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 233,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/12_hires.png",
+    "nationalPokedexNumber": 233,
     "evolvesTo": [
       "Porygon-Z"
     ]
@@ -719,8 +719,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 80,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/13_hires.png",
+    "nationalPokedexNumber": 80
   },
   {
     "id": "ex10-14",
@@ -765,8 +765,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 199,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/14_hires.png",
+    "nationalPokedexNumber": 199
   },
   {
     "id": "ex10-15",
@@ -815,8 +815,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 185,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/15_hires.png",
+    "nationalPokedexNumber": 185
   },
   {
     "id": "ex10-16",
@@ -871,8 +871,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 192,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/16_hires.png",
+    "nationalPokedexNumber": 192
   },
   {
     "id": "ex10-17",
@@ -927,8 +927,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/17_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ex10-18",
@@ -985,8 +985,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 217,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/18_hires.png",
+    "nationalPokedexNumber": 217
   },
   {
     "id": "ex10-19",
@@ -1036,8 +1036,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 134,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/19_hires.png",
+    "nationalPokedexNumber": 134
   },
   {
     "id": "ex10-20",
@@ -1086,8 +1086,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 113,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/20_hires.png",
+    "nationalPokedexNumber": 113,
     "evolvesTo": [
       "Blissey"
     ]
@@ -1133,8 +1133,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 173,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/21_hires.png",
+    "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
     ]
@@ -1193,8 +1193,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/22_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -1240,8 +1240,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 239,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/23_hires.png",
+    "nationalPokedexNumber": 239,
     "evolvesTo": [
       "Electabuzz"
     ]
@@ -1299,8 +1299,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 107,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/24_hires.png",
+    "nationalPokedexNumber": 107
   },
   {
     "id": "ex10-25",
@@ -1354,8 +1354,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 106,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/25_hires.png",
+    "nationalPokedexNumber": 106
   },
   {
     "id": "ex10-26",
@@ -1411,8 +1411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/26_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "ex10-27",
@@ -1464,8 +1464,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/27_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/27_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "ex10-28",
@@ -1519,8 +1519,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 124,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/28_hires.png",
+    "nationalPokedexNumber": 124
   },
   {
     "id": "ex10-29",
@@ -1561,8 +1561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/29_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/29_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "ex10-30",
@@ -1616,8 +1616,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 198,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/30_hires.png",
+    "nationalPokedexNumber": 198,
     "evolvesTo": [
       "Honchkrow"
     ]
@@ -1663,8 +1663,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 238,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/31_hires.png",
+    "nationalPokedexNumber": 238,
     "evolvesTo": [
       "Jynx"
     ]
@@ -1715,8 +1715,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 234,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/32_hires.png",
+    "nationalPokedexNumber": 234
   },
   {
     "id": "ex10-33",
@@ -1749,7 +1749,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of Pokémon in play your opponent has more than you."
       }
     ],
@@ -1759,8 +1759,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 236,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/33_hires.png",
+    "nationalPokedexNumber": 236,
     "evolvesTo": [
       "Hitmonlee",
       "Hitmonchan",
@@ -1808,8 +1808,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 190,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/34_hires.png",
+    "nationalPokedexNumber": 190,
     "evolvesTo": [
       "Ambipom"
     ]
@@ -1868,8 +1868,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 153,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/35_hires.png",
+    "nationalPokedexNumber": 153,
     "evolvesTo": [
       "Meganium"
     ]
@@ -1921,8 +1921,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 36,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/36_hires.png",
+    "nationalPokedexNumber": 36
   },
   {
     "id": "ex10-37",
@@ -1969,8 +1969,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/37_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "ex10-38",
@@ -2021,8 +2021,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 159,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/38_hires.png",
+    "nationalPokedexNumber": 159,
     "evolvesTo": [
       "Feraligatr"
     ]
@@ -2073,7 +2073,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 4,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip 2 coins. This attack does 50 damage times the number of heads."
       }
     ],
@@ -2083,8 +2083,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 210,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/39_hires.png",
+    "nationalPokedexNumber": 210
   },
   {
     "id": "ex10-40",
@@ -2134,8 +2134,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 171,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/40_hires.png",
+    "nationalPokedexNumber": 171
   },
   {
     "id": "ex10-41",
@@ -2192,8 +2192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/41_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "ex10-42",
@@ -2246,8 +2246,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 241,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/42_hires.png",
+    "nationalPokedexNumber": 241
   },
   {
     "id": "ex10-43",
@@ -2302,8 +2302,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/43_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "ex10-44",
@@ -2359,8 +2359,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 195,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/44_hires.png",
+    "nationalPokedexNumber": 195
   },
   {
     "id": "ex10-45",
@@ -2411,8 +2411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 156,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/45_hires.png",
+    "nationalPokedexNumber": 156,
     "evolvesTo": [
       "Typhlosion"
     ]
@@ -2463,8 +2463,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/46_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -2511,8 +2511,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 213,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/47_hires.png",
+    "nationalPokedexNumber": 213
   },
   {
     "id": "ex10-48",
@@ -2555,8 +2555,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/48_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "ex10-49",
@@ -2605,8 +2605,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 178,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/49_hires.png",
+    "nationalPokedexNumber": 178
   },
   {
     "id": "ex10-50",
@@ -2654,8 +2654,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 193,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/50_hires.png",
+    "nationalPokedexNumber": 193,
     "evolvesTo": [
       "Yanmega"
     ]
@@ -2712,8 +2712,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 152,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/51_hires.png",
+    "nationalPokedexNumber": 152,
     "evolvesTo": [
       "Bayleef"
     ]
@@ -2763,8 +2763,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 170,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/52_hires.png",
+    "nationalPokedexNumber": 170,
     "evolvesTo": [
       "Lanturn"
     ]
@@ -2815,8 +2815,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 35,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/53_hires.png",
+    "nationalPokedexNumber": 35,
     "evolvesTo": [
       "Clefable"
     ]
@@ -2867,8 +2867,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 155,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/54_hires.png",
+    "nationalPokedexNumber": 155,
     "evolvesTo": [
       "Quilava"
     ]
@@ -2914,8 +2914,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/55_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -2981,8 +2981,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 180,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/56_hires.png",
+    "nationalPokedexNumber": 180,
     "evolvesTo": [
       "Ampharos"
     ]
@@ -3028,8 +3028,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 207,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/57_hires.png",
+    "nationalPokedexNumber": 207,
     "evolvesTo": [
       "Gliscor"
     ]
@@ -3072,8 +3072,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 44,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/58_hires.png",
+    "nationalPokedexNumber": 44,
     "evolvesTo": [
       "Vileplume",
       "Bellossom"
@@ -3131,8 +3131,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 163,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/59_hires.png",
+    "nationalPokedexNumber": 163,
     "evolvesTo": [
       "Noctowl"
     ]
@@ -3173,8 +3173,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 228,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/60_hires.png",
+    "nationalPokedexNumber": 228,
     "evolvesTo": [
       "Houndoom"
     ]
@@ -3205,7 +3205,7 @@
           "Fire"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Does 10 damage times the number of damage counters on Larvitar."
       },
       {
@@ -3225,8 +3225,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 246,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/61_hires.png",
+    "nationalPokedexNumber": 246,
     "evolvesTo": [
       "Pupitar"
     ]
@@ -3273,8 +3273,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 179,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/62_hires.png",
+    "nationalPokedexNumber": 179,
     "evolvesTo": [
       "Flaaffy"
     ]
@@ -3315,8 +3315,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 177,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/63_hires.png",
+    "nationalPokedexNumber": 177,
     "evolvesTo": [
       "Xatu"
     ]
@@ -3357,8 +3357,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 43,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/64_hires.png",
+    "nationalPokedexNumber": 43,
     "evolvesTo": [
       "Gloom"
     ]
@@ -3411,8 +3411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 95,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/65_hires.png",
+    "nationalPokedexNumber": 95,
     "evolvesTo": [
       "Steelix"
     ]
@@ -3453,8 +3453,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 204,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/66_hires.png",
+    "nationalPokedexNumber": 204,
     "evolvesTo": [
       "Forretress"
     ]
@@ -3504,8 +3504,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 60,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/67_hires.png",
+    "nationalPokedexNumber": 60,
     "evolvesTo": [
       "Poliwhirl"
     ]
@@ -3548,8 +3548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 61,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/68_hires.png",
+    "nationalPokedexNumber": 61,
     "evolvesTo": [
       "Poliwrath",
       "Politoed"
@@ -3581,7 +3581,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 3 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -3591,8 +3591,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/69_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -3643,8 +3643,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 247,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/70_hires.png",
+    "nationalPokedexNumber": 247,
     "evolvesTo": [
       "Tyranitar"
     ]
@@ -3694,8 +3694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 223,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/71_hires.png",
+    "nationalPokedexNumber": 223,
     "evolvesTo": [
       "Octillery"
     ]
@@ -3746,8 +3746,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 79,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/72_hires.png",
+    "nationalPokedexNumber": 79,
     "evolvesTo": [
       "Slowbro",
       "Slowking"
@@ -3798,8 +3798,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/73_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -3840,8 +3840,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 209,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/74_hires.png",
+    "nationalPokedexNumber": 209,
     "evolvesTo": [
       "Granbull"
     ]
@@ -3892,8 +3892,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 167,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/75_hires.png",
+    "nationalPokedexNumber": 167,
     "evolvesTo": [
       "Ariados"
     ]
@@ -3950,8 +3950,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 191,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/76_hires.png",
+    "nationalPokedexNumber": 191,
     "evolvesTo": [
       "Sunflora"
     ]
@@ -4001,8 +4001,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 216,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/77_hires.png",
+    "nationalPokedexNumber": 216,
     "evolvesTo": [
       "Ursaring"
     ]
@@ -4043,8 +4043,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 158,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/78_hires.png",
+    "nationalPokedexNumber": 158,
     "evolvesTo": [
       "Croconaw"
     ]
@@ -4095,8 +4095,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 194,
     "imageUrlHiRes": "https://images.pokemontcg.io/ex10/79_hires.png",
+    "nationalPokedexNumber": 194,
     "evolvesTo": [
       "Quagsire"
     ]
@@ -4540,8 +4540,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/101_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "ex10-102",
@@ -4598,8 +4598,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 196,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/102_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/102_hires.png",
+    "nationalPokedexNumber": 196
   },
   {
     "id": "ex10-103",
@@ -4662,8 +4662,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 160,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/103_hires.png",
+    "nationalPokedexNumber": 160
   },
   {
     "id": "ex10-104",
@@ -4710,8 +4710,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/104_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "ex10-105",
@@ -4766,8 +4766,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/105_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "ex10-106",
@@ -4841,8 +4841,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 154,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/106_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/106_hires.png",
+    "nationalPokedexNumber": 154
   },
   {
     "id": "ex10-107",
@@ -4911,8 +4911,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 186,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/107_hires.png",
+    "nationalPokedexNumber": 186
   },
   {
     "id": "ex10-108",
@@ -4978,8 +4978,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/108_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "ex10-109",
@@ -5059,8 +5059,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 208,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/109_hires.png",
+    "nationalPokedexNumber": 208
   },
   {
     "id": "ex10-110",
@@ -5115,8 +5115,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 157,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/110_hires.png",
+    "nationalPokedexNumber": 157
   },
   {
     "id": "ex10-111",
@@ -5203,8 +5203,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/111_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "ex10-112",
@@ -5269,8 +5269,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/112_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "ex10-113",
@@ -5323,8 +5323,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/113_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "ex10-114",
@@ -5377,8 +5377,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 243,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/114_hires.png",
+    "nationalPokedexNumber": 243
   },
   {
     "id": "ex10-115",
@@ -5431,8 +5431,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/115_hires.png",
+    "nationalPokedexNumber": 245
   },
   {
     "id": "ex10-116",
@@ -5482,8 +5482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/116_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/116_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "ex10-117",
@@ -5535,8 +5535,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/117_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/117_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "ex10-A",
@@ -5579,8 +5579,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/A_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/A_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-B",
@@ -5624,8 +5624,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/B_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/B_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-C",
@@ -5667,8 +5667,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/C_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/C_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-D",
@@ -5710,8 +5710,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/D_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/D_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-E",
@@ -5753,8 +5753,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/E_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/E_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-F",
@@ -5798,8 +5798,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/F_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/F_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-G",
@@ -5842,8 +5842,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/G_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/G_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-H",
@@ -5885,8 +5885,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/H_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/H_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-I",
@@ -5929,8 +5929,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/I_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/I_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-J",
@@ -5972,8 +5972,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/J_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/J_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-K",
@@ -6017,8 +6017,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/K_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/K_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-L",
@@ -6061,8 +6061,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/L_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/L_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-M",
@@ -6104,8 +6104,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/M_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/M_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-N",
@@ -6147,8 +6147,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/N_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/N_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-O",
@@ -6192,8 +6192,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/O_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/O_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-P",
@@ -6236,8 +6236,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/P_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/P_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-Q",
@@ -6279,8 +6279,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/Q_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/Q_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-R",
@@ -6323,8 +6323,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/R_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/R_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-S",
@@ -6367,8 +6367,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/S_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/S_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-T",
@@ -6411,8 +6411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/T_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/T_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-U",
@@ -6456,8 +6456,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/U_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/U_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-V",
@@ -6502,8 +6502,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/V_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/V_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-W",
@@ -6547,8 +6547,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/W_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/W_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-X",
@@ -6582,7 +6582,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "Flip a coin until you get tails. This attack does 20 damage times the number of heads."
       }
     ],
@@ -6592,8 +6592,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/X_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/X_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-Y",
@@ -6636,8 +6636,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/Y_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/Y_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-Z",
@@ -6679,8 +6679,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/Z_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/Z_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-!",
@@ -6722,8 +6722,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/!_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/!_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "ex10-?",
@@ -6765,7 +6765,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/question_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/ex10/question_hires.png",
+    "nationalPokedexNumber": 201
   }
 ]
diff --git a/json/cards/Wizards Black Star Promos.json b/json/cards/Wizards Black Star Promos.json
index 89bcd356d..4a3ed5952 100644
--- a/json/cards/Wizards Black Star Promos.json	
+++ b/json/cards/Wizards Black Star Promos.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/1_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -98,8 +98,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/2_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -152,8 +152,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/3_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/3_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "basep-4",
@@ -202,8 +202,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/4_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -253,8 +253,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 149,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/5_hires.png",
+    "nationalPokedexNumber": 149
   },
   {
     "id": "basep-6",
@@ -304,8 +304,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 59,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/6_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/6_hires.png",
+    "nationalPokedexNumber": 59
   },
   {
     "id": "basep-7",
@@ -360,8 +360,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/7_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -412,8 +412,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/8_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "basep-9",
@@ -461,8 +461,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/9_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "basep-10",
@@ -507,8 +507,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/10_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -557,8 +557,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 133,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/11_hires.png",
+    "nationalPokedexNumber": 133,
     "evolvesTo": [
       "Vaporeon",
       "Jolteon",
@@ -617,8 +617,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/12_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/12_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "basep-13",
@@ -665,8 +665,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/13_hires.png",
+    "nationalPokedexNumber": 3
   },
   {
     "id": "basep-14",
@@ -716,8 +716,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/14_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "basep-15",
@@ -774,8 +774,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 137,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/15_hires.png",
+    "nationalPokedexNumber": 137,
     "evolvesTo": [
       "Porygon2"
     ]
@@ -846,8 +846,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 53,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/17_hires.png",
+    "nationalPokedexNumber": 53
   },
   {
     "id": "basep-18",
@@ -892,8 +892,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 52,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/18_hires.png",
+    "nationalPokedexNumber": 52,
     "evolvesTo": [
       "Persian"
     ]
@@ -906,9 +906,7 @@
     "supertype": "Pokémon",
     "level": "15",
     "hp": "40",
-    "retreatCost": [
-      "Colorless"
-    ],
+    "retreatCost": "",
     "number": "19",
     "artist": "Atsuko Nishida",
     "series": "Base",
@@ -944,8 +942,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 63,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/19_hires.png",
+    "nationalPokedexNumber": 63,
     "evolvesTo": [
       "Kadabra"
     ]
@@ -995,8 +993,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 54,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/20_hires.png",
+    "nationalPokedexNumber": 54,
     "evolvesTo": [
       "Golduck"
     ]
@@ -1039,8 +1037,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/21_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "basep-22",
@@ -1080,8 +1078,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/22_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "basep-23",
@@ -1121,8 +1119,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 145,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/23_hires.png",
+    "nationalPokedexNumber": 145
   },
   {
     "id": "basep-24",
@@ -1161,8 +1159,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/24_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1214,8 +1212,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/25_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1266,8 +1264,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/26_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1315,8 +1313,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/27_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1330,7 +1328,6 @@
     "level": "32",
     "hp": "50",
     "retreatCost": [
-      "Colorless",
       "Colorless"
     ],
     "number": "28",
@@ -1359,8 +1356,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/28_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -1403,8 +1400,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 183,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/29_hires.png",
+    "nationalPokedexNumber": 183,
     "evolvesTo": [
       "Azumarill"
     ]
@@ -1455,8 +1452,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 175,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/30_hires.png",
+    "nationalPokedexNumber": 175,
     "evolvesTo": [
       "Togetic"
     ]
@@ -1474,6 +1471,9 @@
     "series": "Base",
     "set": "Wizards Black Star Promos",
     "setCode": "basep",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Colorless"
     ],
@@ -1489,9 +1489,6 @@
       }
     ],
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/31_hires.png",
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
     "nationalPokedexNumber": 173,
     "evolvesTo": [
       "Clefairy"
@@ -1536,8 +1533,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 235,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/32_hires.png",
+    "nationalPokedexNumber": 235
   },
   {
     "id": "basep-33",
@@ -1594,8 +1591,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 212,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/33_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/33_hires.png",
+    "nationalPokedexNumber": 212
   },
   {
     "id": "basep-34",
@@ -1640,8 +1637,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 244,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/34_hires.png",
+    "nationalPokedexNumber": 244
   },
   {
     "id": "basep-35",
@@ -1656,6 +1653,9 @@
     "series": "Base",
     "set": "Wizards Black Star Promos",
     "setCode": "basep",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Lightning"
     ],
@@ -1671,9 +1671,6 @@
       }
     ],
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/35_hires.png",
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
     "nationalPokedexNumber": 172,
     "evolvesTo": [
       "Pikachu"
@@ -1692,6 +1689,9 @@
     "series": "Base",
     "set": "Wizards Black Star Promos",
     "setCode": "basep",
+    "text": [
+      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
+    ],
     "types": [
       "Colorless"
     ],
@@ -1707,9 +1707,6 @@
       }
     ],
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/36_hires.png",
-    "text": [
-      "If this Baby Pokémon is your Active Pokémon and your opponent tries to attack, your opponent flips a coin (before doing anything else required in order to use that attack). If tails, your opponent's turn ends without an attack."
-    ],
     "nationalPokedexNumber": 174,
     "evolvesTo": [
       "Jigglypuff"
@@ -1763,8 +1760,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 237,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/37_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/37_hires.png",
+    "nationalPokedexNumber": 237
   },
   {
     "id": "basep-38",
@@ -1807,8 +1804,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 201,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/38_hires.png",
+    "nationalPokedexNumber": 201
   },
   {
     "id": "basep-39",
@@ -1856,8 +1853,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 200,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/39_hires.png",
+    "nationalPokedexNumber": 200,
     "evolvesTo": [
       "Mismagius"
     ]
@@ -1962,8 +1959,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/43_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "basep-44",
@@ -2013,8 +2010,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 126,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/44_hires.png",
+    "nationalPokedexNumber": 126,
     "evolvesTo": [
       "Magmortar"
     ]
@@ -2062,8 +2059,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 123,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/45_hires.png",
+    "nationalPokedexNumber": 123,
     "evolvesTo": [
       "Scizor"
     ]
@@ -2114,8 +2111,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 125,
     "imageUrlHiRes": "https://images.pokemontcg.io/basep/46_hires.png",
+    "nationalPokedexNumber": 125,
     "evolvesTo": [
       "Electivire"
     ]
@@ -2161,8 +2158,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/47_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "basep-48",
@@ -2209,8 +2206,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 144,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/48_hires.png",
+    "nationalPokedexNumber": 144
   },
   {
     "id": "basep-49",
@@ -2265,8 +2262,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 143,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/49_hires.png",
+    "nationalPokedexNumber": 143
   },
   {
     "id": "basep-50",
@@ -2304,8 +2301,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/50_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "basep-51",
@@ -2352,8 +2349,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 78,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/51_hires.png",
+    "nationalPokedexNumber": 78
   },
   {
     "id": "basep-52",
@@ -2400,8 +2397,8 @@
         "value": "-30"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/52_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "basep-53",
@@ -2411,7 +2408,7 @@
     "supertype": "Pokémon",
     "ability": {
       "name": "Pure Body",
-      "text": "Whenever you attach a Water Energy card to Suicune from your hand, you must discard 1 other Energy card attached to Suicune. (If you can't discard Energy cards, you can't attach the Water Energy card.)",
+      "text": "To attach a Water Energy card from your hand to Suicune, you must discard an Energy card attached to Suicune. (Attach the Water Energy, and then discard an Energy card from Suicune.)",
       "type": "Poké-Body"
     },
     "hp": "70",
@@ -2436,7 +2433,7 @@
         ],
         "convertedEnergyCost": 3,
         "damage": "30+",
-        "text": "Flip a coin. If heads, this attack does 30 damage plus 20 more damage. If tails, the Defending Pokémon is now Asleep."
+        "text": "Flip a coin. If heads, this attack does 30 damage plus 20 more damage. If tails, this attack does 30 damage and the Defending Pokémon is now Asleep."
       }
     ],
     "weaknesses": [
@@ -2445,7 +2442,7 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 245,
-    "imageUrlHiRes": "https://images.pokemontcg.io/basep/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/basep/53_hires.png",
+    "nationalPokedexNumber": 245
   }
 ]
diff --git a/json/cards/XY Black Star Promos.json b/json/cards/XY Black Star Promos.json
index 4cb6865fe..48f465310 100644
--- a/json/cards/XY Black Star Promos.json	
+++ b/json/cards/XY Black Star Promos.json	
@@ -45,8 +45,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY01_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -97,8 +97,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 653,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY02_hires.png",
+    "nationalPokedexNumber": 653,
     "evolvesTo": [
       "Braixen"
     ]
@@ -149,8 +149,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 656,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY03_hires.png",
+    "nationalPokedexNumber": 656,
     "evolvesTo": [
       "Frogadier"
     ]
@@ -209,8 +209,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 700,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY04_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY04_hires.png",
+    "nationalPokedexNumber": 700
   },
   {
     "id": "xyp-XY05",
@@ -266,8 +266,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY05_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY05_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xyp-XY06",
@@ -323,8 +323,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY06_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY06_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xyp-XY07",
@@ -386,8 +386,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY07_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY07_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xyp-XY08",
@@ -447,8 +447,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY08_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY08_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xyp-XY09",
@@ -502,8 +502,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY09_hires.png",
+    "nationalPokedexNumber": 445,
     "evolvesTo": "M Garchomp-EX"
   },
   {
@@ -550,8 +550,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 691,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY10_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY10_hires.png",
+    "nationalPokedexNumber": 691
   },
   {
     "id": "xyp-XY11",
@@ -591,8 +591,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 672,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY11_hires.png",
+    "nationalPokedexNumber": 672,
     "evolvesTo": [
       "Gogoat"
     ]
@@ -650,8 +650,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 679,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY12_hires.png",
+    "nationalPokedexNumber": 679,
     "evolvesTo": [
       "Doublade"
     ]
@@ -701,8 +701,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY13_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY13_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xyp-XY14",
@@ -760,8 +760,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY14_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xyp-XY15",
@@ -819,8 +819,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 685,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY15_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY15_hires.png",
+    "nationalPokedexNumber": 685
   },
   {
     "id": "xyp-XY16",
@@ -873,8 +873,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 673,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY16_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY16_hires.png",
+    "nationalPokedexNumber": 673
   },
   {
     "id": "xyp-XY17",
@@ -930,8 +930,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY17_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -990,8 +990,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 652,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY18_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY18_hires.png",
+    "nationalPokedexNumber": 652
   },
   {
     "id": "xyp-XY19",
@@ -1045,8 +1045,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 655,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY19_hires.png",
+    "nationalPokedexNumber": 655
   },
   {
     "id": "xyp-XY20",
@@ -1098,8 +1098,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY20_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY20_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xyp-XY21",
@@ -1153,8 +1153,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 437,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY21_hires.png",
+    "nationalPokedexNumber": 437
   },
   {
     "id": "xyp-XY22",
@@ -1210,8 +1210,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY22_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY22_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "xyp-XY23",
@@ -1262,8 +1262,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 275,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY23_hires.png",
+    "nationalPokedexNumber": 275
   },
   {
     "id": "xyp-XY24",
@@ -1314,8 +1314,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY24_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY24_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xyp-XY25",
@@ -1378,8 +1378,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY25_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY25_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "xyp-XY26",
@@ -1432,8 +1432,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 668,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY26_hires.png",
+    "nationalPokedexNumber": 668
   },
   {
     "id": "xyp-XY27",
@@ -1509,8 +1509,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY28_hires.png",
+    "nationalPokedexNumber": 3,
     "evolvesTo": "M Venusaur-EX"
   },
   {
@@ -1565,8 +1565,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY29_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -1622,8 +1622,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY30_hires.png",
+    "nationalPokedexNumber": 9,
     "evolvesTo": "M Blastoise-EX"
   },
   {
@@ -1683,8 +1683,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY31_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY31_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xyp-XY32",
@@ -1743,8 +1743,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY32_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xyp-XY33",
@@ -1824,8 +1824,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY34_hires.png",
+    "nationalPokedexNumber": 376,
     "evolvesTo": "M Metagross-EX"
   },
   {
@@ -1880,8 +1880,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 376,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY35_hires.png",
+    "nationalPokedexNumber": 376
   },
   {
     "id": "xyp-XY36",
@@ -1919,8 +1919,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 252,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY36_hires.png",
+    "nationalPokedexNumber": 252,
     "evolvesTo": [
       "Grovyle"
     ]
@@ -1961,8 +1961,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 255,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY37_hires.png",
+    "nationalPokedexNumber": 255,
     "evolvesTo": [
       "Combusken"
     ]
@@ -2013,8 +2013,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 258,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY38_hires.png",
+    "nationalPokedexNumber": 258,
     "evolvesTo": [
       "Marshtomp"
     ]
@@ -2026,6 +2026,10 @@
     "subtype": "Stage 2",
     "supertype": "Pokémon",
     "evolvesFrom": "Seadra",
+    "ancientTrait": {
+      "name": "α Growth",
+      "text": "When you attach an Energy card from your hand to this Pokémon (except with an attack, Ability, or Trainer card), you may attach 2 Energy cards."
+    },
     "hp": "130",
     "retreatCost": [
       "Colorless"
@@ -2067,8 +2071,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 230,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY39_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY39_hires.png",
+    "nationalPokedexNumber": 230
   },
   {
     "id": "xyp-XY40",
@@ -2112,8 +2116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 132,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY40_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY40_hires.png",
+    "nationalPokedexNumber": 132
   },
   {
     "id": "xyp-XY41",
@@ -2170,8 +2174,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY41_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xyp-XY42",
@@ -2228,8 +2232,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY42_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY42_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xyp-XY43",
@@ -2289,8 +2293,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 719,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY43_hires.png",
+    "nationalPokedexNumber": 719,
     "evolvesTo": "M Diancie-EX"
   },
   {
@@ -2343,8 +2347,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 719,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY44_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY44_hires.png",
+    "nationalPokedexNumber": 719
   },
   {
     "id": "xyp-XY45",
@@ -2400,8 +2404,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 475,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY45_hires.png",
+    "nationalPokedexNumber": 475,
     "evolvesTo": "M Gallade-EX"
   },
   {
@@ -2416,6 +2420,10 @@
       "text": "Each of your Colorless Pokémon has no Weakness.",
       "type": "Ability"
     },
+    "ancientTrait": {
+      "name": "Δ Evolution",
+      "text": "You may play this card from your hand to evolve a Pokémon during your first turn or the turn you play that Pokémon."
+    },
     "hp": "90",
     "retreatCost": [
       "Colorless"
@@ -2453,8 +2461,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 334,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY46_hires.png",
+    "nationalPokedexNumber": 334
   },
   {
     "id": "xyp-XY47",
@@ -2506,8 +2514,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 695,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY47_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY47_hires.png",
+    "nationalPokedexNumber": 695
   },
   {
     "id": "xyp-XY48",
@@ -2553,8 +2561,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 678,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY48_hires.png",
+    "nationalPokedexNumber": 678
   },
   {
     "id": "xyp-XY49",
@@ -2606,8 +2614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 377,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY49_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY49_hires.png",
+    "nationalPokedexNumber": 377
   },
   {
     "id": "xyp-XY50",
@@ -2655,8 +2663,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 675,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY50_hires.png",
+    "nationalPokedexNumber": 675
   },
   {
     "id": "xyp-XY51",
@@ -2688,7 +2696,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       },
       {
@@ -2710,8 +2718,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 382,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY51_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY51_hires.png",
+    "nationalPokedexNumber": 382
   },
   {
     "id": "xyp-XY52",
@@ -2765,8 +2773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 383,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY52_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY52_hires.png",
+    "nationalPokedexNumber": 383
   },
   {
     "id": "xyp-XY53",
@@ -2818,8 +2826,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 254,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY53_hires.png",
+    "nationalPokedexNumber": 254,
     "evolvesTo": "M Sceptile-EX"
   },
   {
@@ -2875,8 +2883,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY54_hires.png",
+    "nationalPokedexNumber": 257,
     "evolvesTo": "M Blaziken-EX"
   },
   {
@@ -2934,8 +2942,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY55_hires.png",
+    "nationalPokedexNumber": 260,
     "evolvesTo": "M Swampert-EX"
   },
   {
@@ -2989,8 +2997,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 242,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY56_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY56_hires.png",
+    "nationalPokedexNumber": 242
   },
   {
     "id": "xyp-XY57",
@@ -3046,8 +3054,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 22,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY57_hires.png",
+    "nationalPokedexNumber": 22
   },
   {
     "id": "xyp-XY58",
@@ -3100,8 +3108,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 687,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY58_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY58_hires.png",
+    "nationalPokedexNumber": 687
   },
   {
     "id": "xyp-XY59",
@@ -3153,8 +3161,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY59_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "xyp-XY60",
@@ -3163,6 +3171,10 @@
     "subtype": "Stage 1",
     "supertype": "Pokémon",
     "evolvesFrom": "Magikarp",
+    "ancientTrait": {
+      "name": "θ Double",
+      "text": "This Pokémon may have up to 2 Pokémon Tool cards attached to it."
+    },
     "hp": "130",
     "retreatCost": [
       "Colorless",
@@ -3208,8 +3220,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY60_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY60_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xyp-XY61",
@@ -3259,8 +3271,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 330,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY61_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY61_hires.png",
+    "nationalPokedexNumber": 330
   },
   {
     "id": "xyp-XY62",
@@ -3319,8 +3331,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY62_hires.png",
+    "nationalPokedexNumber": 359,
     "evolvesTo": "M Absol-EX"
   },
   {
@@ -3372,8 +3384,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY63_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "xyp-XY64",
@@ -3421,8 +3433,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY64_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "xyp-XY65",
@@ -3472,8 +3484,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY65_hires.png",
+    "nationalPokedexNumber": 381,
     "evolvesTo": "M Latios"
   },
   {
@@ -3535,8 +3547,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY66_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -3591,8 +3603,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY67_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "xyp-XY67a",
@@ -3646,8 +3658,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY67a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY67a_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "xyp-XY68",
@@ -3703,8 +3715,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 652,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY68_hires.png",
+    "nationalPokedexNumber": 652
   },
   {
     "id": "xyp-XY69",
@@ -3765,8 +3777,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY69_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -3818,8 +3830,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 697,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY70_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY70_hires.png",
+    "nationalPokedexNumber": 697
   },
   {
     "id": "xyp-XY71",
@@ -3868,8 +3880,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY71_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xyp-XY72",
@@ -3923,8 +3935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY72_hires.png",
+    "nationalPokedexNumber": 381,
     "evolvesTo": "M Latios-EX"
   },
   {
@@ -3980,8 +3992,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY73_hires.png",
+    "nationalPokedexNumber": 384,
     "evolvesTo": "M Rayquaza-EX"
   },
   {
@@ -4034,8 +4046,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 643,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY74_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY74_hires.png",
+    "nationalPokedexNumber": 643
   },
   {
     "id": "xyp-XY75",
@@ -4087,8 +4099,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 484,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY75_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY75_hires.png",
+    "nationalPokedexNumber": 484
   },
   {
     "id": "xyp-XY76",
@@ -4146,8 +4158,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 644,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY76_hires.png",
+    "nationalPokedexNumber": 644
   },
   {
     "id": "xyp-XY77",
@@ -4205,8 +4217,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 483,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY77_hires.png",
+    "nationalPokedexNumber": 483
   },
   {
     "id": "xyp-XY78",
@@ -4255,8 +4267,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 380,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY78_hires.png",
+    "nationalPokedexNumber": 380
   },
   {
     "id": "xyp-XY79",
@@ -4306,8 +4318,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 381,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY79_hires.png",
+    "nationalPokedexNumber": 381
   },
   {
     "id": "xyp-XY80",
@@ -4361,8 +4373,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY80_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "xyp-XY81",
@@ -4416,8 +4428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY81_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY81_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "xyp-XY82",
@@ -4466,8 +4478,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 486,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY82_hires.png",
+    "nationalPokedexNumber": 486
   },
   {
     "id": "xyp-XY83",
@@ -4517,8 +4529,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY83_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY83_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "xyp-XY84",
@@ -4576,8 +4588,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY84_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4633,8 +4645,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY85_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xyp-XY86",
@@ -4681,8 +4693,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 257,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY86_hires.png",
+    "nationalPokedexNumber": 257
   },
   {
     "id": "xyp-XY87",
@@ -4730,8 +4742,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 260,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY87_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY87_hires.png",
+    "nationalPokedexNumber": 260
   },
   {
     "id": "xyp-XY88",
@@ -4771,8 +4783,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY88_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -4830,8 +4842,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY89_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -4883,8 +4895,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY90_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xyp-XY91",
@@ -4944,8 +4956,8 @@
         "text": ""
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY92_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY92_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "xyp-XY93",
@@ -4988,8 +5000,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY93_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "xyp-XY94",
@@ -5030,8 +5042,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY94_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY94_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xyp-XY95",
@@ -5085,8 +5097,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY95_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -5136,8 +5148,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 197,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY96_hires.png",
+    "nationalPokedexNumber": 197
   },
   {
     "id": "xyp-XY97",
@@ -5196,8 +5208,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 142,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY97_hires.png",
+    "nationalPokedexNumber": 142,
     "evolvesTo": "M Aerodactyl-EX"
   },
   {
@@ -5249,8 +5261,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 142,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY98_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY98_hires.png",
+    "nationalPokedexNumber": 142
   },
   {
     "id": "xyp-XY99",
@@ -5307,8 +5319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY100_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xyp-XY101",
@@ -5348,8 +5360,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY101_hires.png",
+    "nationalPokedexNumber": 150
   },
   {
     "id": "xyp-XY102",
@@ -5380,14 +5392,6 @@
     "types": [
       "Water"
     ],
-    "weaknesses": [
-      {
-        "type": "Metal",
-        "value": "×2"
-      }
-    ],
-    "nationalPokedexNumber": 699,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY102_hires.png",
     "attacks": [
       {
         "cost": [
@@ -5401,7 +5405,15 @@
         "damage": "160",
         "convertedEnergyCost": 4
       }
-    ]
+    ],
+    "weaknesses": [
+      {
+        "type": "Metal",
+        "value": "×2"
+      }
+    ],
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY102_hires.png",
+    "nationalPokedexNumber": 699
   },
   {
     "id": "xyp-XY103",
@@ -5460,8 +5472,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY103_hires.png",
+    "nationalPokedexNumber": 303,
     "evolvesTo": "M Mawile-EX"
   },
   {
@@ -5514,8 +5526,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 303,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY104_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY104_hires.png",
+    "nationalPokedexNumber": 303
   },
   {
     "id": "xyp-XY105",
@@ -5576,8 +5588,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY106_hires.png",
+    "nationalPokedexNumber": 130,
     "evolvesTo": "M Gyarados-EX"
   },
   {
@@ -5620,8 +5632,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY107_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -5666,8 +5678,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 68,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY108_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY108_hires.png",
+    "nationalPokedexNumber": 68
   },
   {
     "id": "xyp-XY109",
@@ -5722,8 +5734,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 130,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY109_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY109_hires.png",
+    "nationalPokedexNumber": 130
   },
   {
     "id": "xyp-XY110",
@@ -5761,8 +5773,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY110_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "xyp-XY111",
@@ -5800,8 +5812,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 251,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY111_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY111_hires.png",
+    "nationalPokedexNumber": 251
   },
   {
     "id": "xyp-XY112",
@@ -5845,8 +5857,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 385,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY112_hires.png",
+    "nationalPokedexNumber": 385
   },
   {
     "id": "xyp-XY113",
@@ -5894,8 +5906,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 490,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY113_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY113_hires.png",
+    "nationalPokedexNumber": 490
   },
   {
     "id": "xyp-XY114",
@@ -5952,8 +5964,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 491,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY114_hires.png",
+    "nationalPokedexNumber": 491
   },
   {
     "id": "xyp-XY115",
@@ -6003,8 +6015,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY115_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY115_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "xyp-XY116",
@@ -6055,8 +6067,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 493,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY116_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY116_hires.png",
+    "nationalPokedexNumber": 493
   },
   {
     "id": "xyp-XY117",
@@ -6104,8 +6116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 494,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY117_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY117_hires.png",
+    "nationalPokedexNumber": 494
   },
   {
     "id": "xyp-XY118",
@@ -6150,8 +6162,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 647,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY118_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY118_hires.png",
+    "nationalPokedexNumber": 647
   },
   {
     "id": "xyp-XY119",
@@ -6208,8 +6220,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 649,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY119_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY119_hires.png",
+    "nationalPokedexNumber": 649
   },
   {
     "id": "xyp-XY120",
@@ -6257,8 +6269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 648,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY120_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY120_hires.png",
+    "nationalPokedexNumber": 648
   },
   {
     "id": "xyp-XY121",
@@ -6300,8 +6312,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 6,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY121_hires.png",
+    "nationalPokedexNumber": 6,
     "evolvesTo": "M Charizard-EX"
   },
   {
@@ -6357,8 +6369,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY122_hires.png",
+    "nationalPokedexNumber": 9,
     "evolvesTo": "M Blastoise-EX"
   },
   {
@@ -6417,8 +6429,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY123_hires.png",
+    "nationalPokedexNumber": 3,
     "evolvesTo": "M Venusaur-EX"
   },
   {
@@ -6477,8 +6489,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY124_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -6536,8 +6548,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 150,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY125_hires.png",
+    "nationalPokedexNumber": 150,
     "evolvesTo": "M Mewtwo-EX"
   },
   {
@@ -6584,8 +6596,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 151,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY126_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY126_hires.png",
+    "nationalPokedexNumber": 151
   },
   {
     "id": "xyp-XY127",
@@ -6641,8 +6653,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 146,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY127_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY127_hires.png",
+    "nationalPokedexNumber": 146
   },
   {
     "id": "xyp-XY128",
@@ -6694,8 +6706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 646,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY128_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY128_hires.png",
+    "nationalPokedexNumber": 646
   },
   {
     "id": "xyp-XY129",
@@ -6746,8 +6758,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY129_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY129_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xyp-XY130",
@@ -6804,8 +6816,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 248,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY130_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY130_hires.png",
+    "nationalPokedexNumber": 248
   },
   {
     "id": "xyp-XY131",
@@ -6843,8 +6855,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY131_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -6891,8 +6903,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 92,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY132_hires.png",
+    "nationalPokedexNumber": 92,
     "evolvesTo": [
       "Haunter"
     ]
@@ -6948,8 +6960,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY133_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY133_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xyp-XY134",
@@ -6983,8 +6995,8 @@
         "text": "This attack does 30 damage times the number of Pokémon your opponent has in play."
       }
     ],
-    "nationalPokedexNumber": 395,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY134_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY134_hires.png",
+    "nationalPokedexNumber": 395
   },
   {
     "id": "xyp-XY135",
@@ -7019,8 +7031,8 @@
         "text": "Move as many Psychic Energy attached to your Pokémon to your other Pokémon in any way you like."
       }
     ],
-    "nationalPokedexNumber": 606,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY135_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY135_hires.png",
+    "nationalPokedexNumber": 606
   },
   {
     "id": "xyp-XY136",
@@ -7055,8 +7067,8 @@
         "text": "Your opponent reveals his or her hand. This attack does 30 more damage for each Trainer card you find there."
       }
     ],
-    "nationalPokedexNumber": 164,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY136_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY136_hires.png",
+    "nationalPokedexNumber": 164
   },
   {
     "id": "xyp-XY137",
@@ -7104,8 +7116,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 666,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY137_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY137_hires.png",
+    "nationalPokedexNumber": 666
   },
   {
     "id": "xyp-XY138",
@@ -7143,8 +7155,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 656,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY138_hires.png",
+    "nationalPokedexNumber": 656,
     "evolvesTo": [
       "Frogadier"
     ]
@@ -7186,7 +7198,7 @@
           "Fairy"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20＋",
+        "damage": "20+",
         "text": "Flip a coin. If heads, this attack does 20 more damage and heal 20 damage from this Pokémon."
       }
     ],
@@ -7202,8 +7214,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 670,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY139_hires.png",
+    "nationalPokedexNumber": 670,
     "evolvesTo": [
       "Florges"
     ]
@@ -7257,8 +7269,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 448,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY140_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY140_hires.png",
+    "nationalPokedexNumber": 448
   },
   {
     "id": "xyp-XY141",
@@ -7310,8 +7322,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 384,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY141_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY141_hires.png",
+    "nationalPokedexNumber": 384
   },
   {
     "id": "xyp-XY142",
@@ -7360,8 +7372,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 482,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY142_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY142_hires.png",
+    "nationalPokedexNumber": 482
   },
   {
     "id": "xyp-XY143",
@@ -7399,8 +7411,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 129,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY143_hires.png",
+    "nationalPokedexNumber": 129,
     "evolvesTo": [
       "Gyarados"
     ]
@@ -7452,8 +7464,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 469,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY144_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY144_hires.png",
+    "nationalPokedexNumber": 469
   },
   {
     "id": "xyp-XY145",
@@ -7503,8 +7515,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY145_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xyp-XY146",
@@ -7551,8 +7563,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 693,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY146_hires.png",
+    "nationalPokedexNumber": 693
   },
   {
     "id": "xyp-XY147",
@@ -7602,8 +7614,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 720,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY147_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY147_hires.png",
+    "nationalPokedexNumber": 720
   },
   {
     "id": "xyp-XY148",
@@ -7652,8 +7664,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 492,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY148_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY148_hires.png",
+    "nationalPokedexNumber": 492
   },
   {
     "id": "xyp-XY149",
@@ -7715,8 +7727,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY149_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY149_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xyp-XY150",
@@ -7776,8 +7788,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY150_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY150_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xyp-XY150a",
@@ -7837,8 +7849,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY150a_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY150a_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xyp-XY151",
@@ -7902,8 +7914,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY151_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY151_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xyp-XY152",
@@ -7954,8 +7966,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 718,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY152_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY152_hires.png",
+    "nationalPokedexNumber": 718
   },
   {
     "id": "xyp-XY153",
@@ -8012,8 +8024,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY153_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY153_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "xyp-XY154",
@@ -8050,8 +8062,8 @@
         "text": "This Pokémon can't use Shining Flame during your next turn."
       }
     ],
-    "nationalPokedexNumber": 250,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY154_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY154_hires.png",
+    "nationalPokedexNumber": 250
   },
   {
     "id": "xyp-XY155",
@@ -8091,8 +8103,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 202,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY155_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY155_hires.png",
+    "nationalPokedexNumber": 202
   },
   {
     "id": "xyp-XY156",
@@ -8150,8 +8162,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 249,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY156_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY156_hires.png",
+    "nationalPokedexNumber": 249
   },
   {
     "id": "xyp-XY157",
@@ -8202,8 +8214,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY157_hires.png",
+    "nationalPokedexNumber": 15,
     "evolvesTo": "M Beedrill-EX"
   },
   {
@@ -8245,8 +8257,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY158_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY158_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "xyp-XY159",
@@ -8269,7 +8281,6 @@
     "id": "xyp-XY160",
     "name": "Black Kyurem",
     "imageUrl": "https://images.pokemontcg.io/xyp/XY160.png",
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY160_hires.png",
     "subtype": "Basic",
     "supertype": "Pokémon",
     "hp": "130",
@@ -8316,13 +8327,13 @@
         "type": "Metal",
         "value": "×2"
       }
-    ]
+    ],
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY160_hires.png"
   },
   {
     "id": "xyp-XY161",
     "name": "Braixen",
     "imageUrl": "https://images.pokemontcg.io/xyp/XY161.png",
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY161_hires.png",
     "subtype": "Stage 1",
     "supertype": "Pokémon",
     "hp": "80",
@@ -8363,7 +8374,8 @@
         "type": "Water",
         "value": "×2"
       }
-    ]
+    ],
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY161_hires.png"
   },
   {
     "id": "xyp-XY164",
@@ -8418,8 +8430,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY164_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY164_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xyp-XY165",
@@ -8472,8 +8484,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 801,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY165_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY165_hires.png",
+    "nationalPokedexNumber": 801
   },
   {
     "id": "xyp-XY167",
@@ -8527,8 +8539,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY167_hires.png",
+    "nationalPokedexNumber": 445,
     "evolvesTo": "M Garchomp-EX"
   },
   {
@@ -8572,8 +8584,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 445,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY168_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY168_hires.png",
+    "nationalPokedexNumber": 445
   },
   {
     "id": "xyp-XY169",
@@ -8646,8 +8658,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 373,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY170_hires.png",
+    "nationalPokedexNumber": 373,
     "evolvesTo": "M Salamence-EX"
   },
   {
@@ -8694,8 +8706,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 373,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY171_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY171_hires.png",
+    "nationalPokedexNumber": 373
   },
   {
     "id": "xyp-XY172",
@@ -8759,8 +8771,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 721,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY173_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY173_hires.png",
+    "nationalPokedexNumber": 721
   },
   {
     "id": "xyp-XY174",
@@ -8819,8 +8831,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY174_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -8877,8 +8889,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 801,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY175_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY175_hires.png",
+    "nationalPokedexNumber": 801
   },
   {
     "id": "xyp-XY176",
@@ -8980,8 +8992,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 359,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY178_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY178_hires.png",
+    "nationalPokedexNumber": 359
   },
   {
     "id": "xyp-XY184",
@@ -9034,8 +9046,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 487,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY184_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY184_hires.png",
+    "nationalPokedexNumber": 487
   },
   {
     "id": "xyp-XY181",
@@ -9070,14 +9082,13 @@
         "text": "You may leave your opponent's Active Pokémon Paralyzed. If you do, shuffle this Pokémon and all cards attached to it into your deck."
       }
     ],
-    "nationalPokedexNumber": 169,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY181_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY181_hires.png",
+    "nationalPokedexNumber": 169
   },
   {
     "id": "xyp-XY183",
-    "name": "Mewtwo EX",
+    "name": "Mewtwo-EX",
     "imageUrl": "https://images.pokemontcg.io/xyp/XY183.png",
-    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY183_hires.png",
     "subtype": "EX",
     "supertype": "Pokémon",
     "hp": "170",
@@ -9091,6 +9102,9 @@
     "series": "XY",
     "set": "XY Black Star Promos",
     "setCode": "xyp",
+    "text": [
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+    ],
     "types": [
       "Psychic"
     ],
@@ -9122,6 +9136,7 @@
         "type": "Psychic",
         "value": "×2"
       }
-    ]
+    ],
+    "imageUrlHiRes": "https://images.pokemontcg.io/xyp/XY183_hires.png"
   }
 ]
diff --git a/json/cards/XY.json b/json/cards/XY.json
index cf95a131b..e5251f7b3 100644
--- a/json/cards/XY.json
+++ b/json/cards/XY.json
@@ -55,8 +55,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/1_hires.png",
+    "nationalPokedexNumber": 3,
     "evolvesTo": "M Venusaur-EX"
   },
   {
@@ -65,6 +65,7 @@
     "imageUrl": "https://images.pokemontcg.io/xy1/2.png",
     "subtype": "MEGA",
     "supertype": "Pokémon",
+    "evolvesFrom": "Venusaur-EX",
     "hp": "230",
     "retreatCost": [
       "Colorless",
@@ -79,7 +80,11 @@
     "set": "XY",
     "setCode": "xy1",
     "text": [
-      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards.",
+      "When 1 of your Pokémon becomes a Mega Evolution Pokémon, your turn ends."
+    ],
+    "types": [
+      "Grass"
     ],
     "attacks": [
       {
@@ -101,12 +106,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Grass"
-    ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/2_hires.png",
-    "evolvesFrom": "Venusaur-EX"
+    "nationalPokedexNumber": 3
   },
   {
     "id": "xy1-3",
@@ -144,8 +145,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 13,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/3_hires.png",
+    "nationalPokedexNumber": 13,
     "evolvesTo": [
       "Kakuna"
     ]
@@ -188,8 +189,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 14,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/4_hires.png",
+    "nationalPokedexNumber": 14,
     "evolvesTo": [
       "Beedrill"
     ]
@@ -231,7 +232,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 2,
-        "damage": "40x",
+        "damage": "40×",
         "text": "Flip 3 coins. This attack does 40 damage times the number of heads. If all of them are heads, prevent all effects of attacks, including damage, done to this Pokémon during your opponent's next turn."
       }
     ],
@@ -241,8 +242,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 15,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/5_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/5_hires.png",
+    "nationalPokedexNumber": 15
   },
   {
     "id": "xy1-6",
@@ -281,8 +282,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 165,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/6_hires.png",
+    "nationalPokedexNumber": 165,
     "evolvesTo": [
       "Ledian"
     ]
@@ -334,8 +335,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 166,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/7_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/7_hires.png",
+    "nationalPokedexNumber": 166
   },
   {
     "id": "xy1-8",
@@ -383,8 +384,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 313,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/8_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/8_hires.png",
+    "nationalPokedexNumber": 313
   },
   {
     "id": "xy1-9",
@@ -432,8 +433,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 314,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/9_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/9_hires.png",
+    "nationalPokedexNumber": 314
   },
   {
     "id": "xy1-10",
@@ -481,8 +482,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 511,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/10_hires.png",
+    "nationalPokedexNumber": 511,
     "evolvesTo": [
       "Simisage"
     ]
@@ -535,8 +536,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 512,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/11_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/11_hires.png",
+    "nationalPokedexNumber": 512
   },
   {
     "id": "xy1-12",
@@ -565,7 +566,7 @@
           "Grass"
         ],
         "convertedEnergyCost": 1,
-        "damage": "10x",
+        "damage": "10×",
         "text": "Flip 4 coins. This attack does 10 damage times the number of heads."
       }
     ],
@@ -575,8 +576,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 650,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/12_hires.png",
+    "nationalPokedexNumber": 650,
     "evolvesTo": [
       "Quilladin"
     ]
@@ -631,8 +632,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 651,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/13_hires.png",
+    "nationalPokedexNumber": 651,
     "evolvesTo": [
       "Chesnaught"
     ]
@@ -685,8 +686,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 652,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/14_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/14_hires.png",
+    "nationalPokedexNumber": 652
   },
   {
     "id": "xy1-15",
@@ -724,8 +725,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 664,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/15_hires.png",
+    "nationalPokedexNumber": 664,
     "evolvesTo": [
       "Spewpa"
     ]
@@ -780,8 +781,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 665,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/16_hires.png",
+    "nationalPokedexNumber": 665,
     "evolvesTo": [
       "Vivillon"
     ]
@@ -834,8 +835,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 666,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/17_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/17_hires.png",
+    "nationalPokedexNumber": 666
   },
   {
     "id": "xy1-18",
@@ -885,8 +886,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 672,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/18_hires.png",
+    "nationalPokedexNumber": 672,
     "evolvesTo": [
       "Gogoat"
     ]
@@ -940,8 +941,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 673,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/19_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/19_hires.png",
+    "nationalPokedexNumber": 673
   },
   {
     "id": "xy1-20",
@@ -982,8 +983,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 218,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/20_hires.png",
+    "nationalPokedexNumber": 218,
     "evolvesTo": [
       "Magcargo"
     ]
@@ -1039,8 +1040,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 219,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/21_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/21_hires.png",
+    "nationalPokedexNumber": 219
   },
   {
     "id": "xy1-22",
@@ -1088,8 +1089,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 513,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/22_hires.png",
+    "nationalPokedexNumber": 513,
     "evolvesTo": [
       "Simisear"
     ]
@@ -1142,8 +1143,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 514,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/23_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/23_hires.png",
+    "nationalPokedexNumber": 514
   },
   {
     "id": "xy1-24",
@@ -1181,8 +1182,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 653,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/24_hires.png",
+    "nationalPokedexNumber": 653,
     "evolvesTo": [
       "Braixen"
     ]
@@ -1234,8 +1235,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 654,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/25_hires.png",
+    "nationalPokedexNumber": 654,
     "evolvesTo": [
       "Delphox"
     ]
@@ -1285,8 +1286,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 655,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/26_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/26_hires.png",
+    "nationalPokedexNumber": 655
   },
   {
     "id": "xy1-27",
@@ -1341,8 +1342,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 662,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/27_hires.png",
+    "nationalPokedexNumber": 662,
     "evolvesTo": [
       "Talonflame"
     ]
@@ -1397,8 +1398,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 663,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/28_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/28_hires.png",
+    "nationalPokedexNumber": 663
   },
   {
     "id": "xy1-29",
@@ -1453,8 +1454,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/29_hires.png",
+    "nationalPokedexNumber": 9,
     "evolvesTo": "M Blastoise-EX"
   },
   {
@@ -1463,6 +1464,7 @@
     "imageUrl": "https://images.pokemontcg.io/xy1/30.png",
     "subtype": "MEGA",
     "supertype": "Pokémon",
+    "evolvesFrom": "Blastoise-EX",
     "hp": "220",
     "retreatCost": [
       "Colorless",
@@ -1476,7 +1478,11 @@
     "set": "XY",
     "setCode": "xy1",
     "text": [
-      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
+      "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards.",
+      "When 1 of your Pokémon becomes a Mega Evolution Pokémon, your turn ends."
+    ],
+    "types": [
+      "Water"
     ],
     "attacks": [
       {
@@ -1497,12 +1503,8 @@
         "value": "×2"
       }
     ],
-    "types": [
-      "Water"
-    ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/30_hires.png",
-    "evolvesFrom": "Blastoise-EX"
+    "nationalPokedexNumber": 9
   },
   {
     "id": "xy1-31",
@@ -1541,8 +1543,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 90,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/31_hires.png",
+    "nationalPokedexNumber": 90,
     "evolvesTo": [
       "Cloyster"
     ]
@@ -1588,7 +1590,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 5 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -1598,8 +1600,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 91,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/32_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/32_hires.png",
+    "nationalPokedexNumber": 91
   },
   {
     "id": "xy1-33",
@@ -1638,8 +1640,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 120,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/33_hires.png",
+    "nationalPokedexNumber": 120,
     "evolvesTo": [
       "Starmie"
     ]
@@ -1692,8 +1694,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 121,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/34_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/34_hires.png",
+    "nationalPokedexNumber": 121
   },
   {
     "id": "xy1-35",
@@ -1742,8 +1744,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 131,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/35_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/35_hires.png",
+    "nationalPokedexNumber": 131
   },
   {
     "id": "xy1-36",
@@ -1791,8 +1793,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 222,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/36_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/36_hires.png",
+    "nationalPokedexNumber": 222
   },
   {
     "id": "xy1-37",
@@ -1840,8 +1842,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 515,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/37_hires.png",
+    "nationalPokedexNumber": 515,
     "evolvesTo": [
       "Simipour"
     ]
@@ -1894,8 +1896,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 516,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/38_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/38_hires.png",
+    "nationalPokedexNumber": 516
   },
   {
     "id": "xy1-39",
@@ -1933,8 +1935,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 656,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/39_hires.png",
+    "nationalPokedexNumber": 656,
     "evolvesTo": [
       "Frogadier"
     ]
@@ -1977,8 +1979,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 657,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/40_hires.png",
+    "nationalPokedexNumber": 657,
     "evolvesTo": [
       "Greninja"
     ]
@@ -2025,8 +2027,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 658,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/41_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/41_hires.png",
+    "nationalPokedexNumber": 658
   },
   {
     "id": "xy1-42",
@@ -2080,8 +2082,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 25,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/42_hires.png",
+    "nationalPokedexNumber": 25,
     "evolvesTo": [
       "Raichu"
     ]
@@ -2111,7 +2113,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the number of your Benched Pokémon."
       },
       {
@@ -2138,8 +2140,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 26,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/43_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/43_hires.png",
+    "nationalPokedexNumber": 26
   },
   {
     "id": "xy1-44",
@@ -2182,8 +2184,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 100,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/44_hires.png",
+    "nationalPokedexNumber": 100,
     "evolvesTo": [
       "Electrode"
     ]
@@ -2235,8 +2237,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 101,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/45_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/45_hires.png",
+    "nationalPokedexNumber": 101
   },
   {
     "id": "xy1-46",
@@ -2291,8 +2293,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/46_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/46_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "xy1-47",
@@ -2332,8 +2334,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 23,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/47_hires.png",
+    "nationalPokedexNumber": 23,
     "evolvesTo": [
       "Arbok"
     ]
@@ -2386,8 +2388,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 24,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/48_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/48_hires.png",
+    "nationalPokedexNumber": 24
   },
   {
     "id": "xy1-49",
@@ -2425,8 +2427,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 325,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/49_hires.png",
+    "nationalPokedexNumber": 325,
     "evolvesTo": [
       "Grumpig"
     ]
@@ -2481,8 +2483,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 326,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/50_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/50_hires.png",
+    "nationalPokedexNumber": 326
   },
   {
     "id": "xy1-51",
@@ -2523,8 +2525,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 543,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/51_hires.png",
+    "nationalPokedexNumber": 543,
     "evolvesTo": [
       "Whirlipede"
     ]
@@ -2559,7 +2561,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin until you get tails. This attack does 30 damage times the number of heads."
       }
     ],
@@ -2569,8 +2571,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 544,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/52_hires.png",
+    "nationalPokedexNumber": 544,
     "evolvesTo": [
       "Scolipede"
     ]
@@ -2626,8 +2628,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 545,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/53_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/53_hires.png",
+    "nationalPokedexNumber": 545
   },
   {
     "id": "xy1-54",
@@ -2683,8 +2685,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 708,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/54_hires.png",
+    "nationalPokedexNumber": 708,
     "evolvesTo": [
       "Trevenant"
     ]
@@ -2741,8 +2743,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 709,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/55_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/55_hires.png",
+    "nationalPokedexNumber": 709
   },
   {
     "id": "xy1-56",
@@ -2787,8 +2789,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 710,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/56_hires.png",
+    "nationalPokedexNumber": 710,
     "evolvesTo": [
       "Gourgeist"
     ]
@@ -2847,8 +2849,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 711,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/57_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/57_hires.png",
+    "nationalPokedexNumber": 711
   },
   {
     "id": "xy1-58",
@@ -2896,8 +2898,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 50,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/58_hires.png",
+    "nationalPokedexNumber": 50,
     "evolvesTo": [
       "Dugtrio"
     ]
@@ -2950,8 +2952,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 51,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/59_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/59_hires.png",
+    "nationalPokedexNumber": 51
   },
   {
     "id": "xy1-60",
@@ -3002,8 +3004,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 111,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/60_hires.png",
+    "nationalPokedexNumber": 111,
     "evolvesTo": [
       "Rhydon"
     ]
@@ -3061,8 +3063,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 112,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/61_hires.png",
+    "nationalPokedexNumber": 112,
     "evolvesTo": [
       "Rhyperior"
     ]
@@ -3097,7 +3099,7 @@
           "Fighting"
         ],
         "convertedEnergyCost": 1,
-        "damage": "50x",
+        "damage": "50×",
         "text": "Flip a coin for each Fighting Energy attached to this Pokémon. This attack does 50 damage times the number of heads."
       },
       {
@@ -3119,8 +3121,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 464,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/62_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/62_hires.png",
+    "nationalPokedexNumber": 464
   },
   {
     "id": "xy1-63",
@@ -3168,8 +3170,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 337,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/63_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/63_hires.png",
+    "nationalPokedexNumber": 337
   },
   {
     "id": "xy1-64",
@@ -3219,8 +3221,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 338,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/64_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/64_hires.png",
+    "nationalPokedexNumber": 338
   },
   {
     "id": "xy1-65",
@@ -3260,8 +3262,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 532,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/65_hires.png",
+    "nationalPokedexNumber": 532,
     "evolvesTo": [
       "Gurdurr"
     ]
@@ -3317,8 +3319,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 533,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/66_hires.png",
+    "nationalPokedexNumber": 533,
     "evolvesTo": [
       "Conkeldurr"
     ]
@@ -3373,8 +3375,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 534,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/67_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/67_hires.png",
+    "nationalPokedexNumber": 534
   },
   {
     "id": "xy1-68",
@@ -3416,8 +3418,8 @@
         "text": "Flip a coin. If heads, discard an Energy attached to your opponent's Active Pokémon."
       }
     ],
-    "nationalPokedexNumber": 302,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/68_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/68_hires.png",
+    "nationalPokedexNumber": 302
   },
   {
     "id": "xy1-69",
@@ -3475,8 +3477,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 551,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/69_hires.png",
+    "nationalPokedexNumber": 551,
     "evolvesTo": [
       "Krokorok"
     ]
@@ -3538,8 +3540,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 552,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/70_hires.png",
+    "nationalPokedexNumber": 552,
     "evolvesTo": [
       "Krookodile"
     ]
@@ -3603,8 +3605,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 553,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/71_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/71_hires.png",
+    "nationalPokedexNumber": 553
   },
   {
     "id": "xy1-72",
@@ -3658,8 +3660,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 570,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/72_hires.png",
+    "nationalPokedexNumber": 570,
     "evolvesTo": [
       "Zoroark"
     ]
@@ -3718,8 +3720,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 571,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/73_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/73_hires.png",
+    "nationalPokedexNumber": 571
   },
   {
     "id": "xy1-74",
@@ -3768,8 +3770,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 686,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/74_hires.png",
+    "nationalPokedexNumber": 686,
     "evolvesTo": [
       "Malamar"
     ]
@@ -3826,8 +3828,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 686,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/75_hires.png",
+    "nationalPokedexNumber": 686,
     "evolvesTo": [
       "Malamar"
     ]
@@ -3886,8 +3888,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 687,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/76_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/76_hires.png",
+    "nationalPokedexNumber": 687
   },
   {
     "id": "xy1-77",
@@ -3944,8 +3946,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 687,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/77_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/77_hires.png",
+    "nationalPokedexNumber": 687
   },
   {
     "id": "xy1-78",
@@ -4001,8 +4003,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/78_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/78_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xy1-79",
@@ -4062,8 +4064,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/79_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/79_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xy1-80",
@@ -4122,8 +4124,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/80_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/80_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "xy1-81",
@@ -4177,8 +4179,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 624,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/81_hires.png",
+    "nationalPokedexNumber": 624,
     "evolvesTo": [
       "Bisharp"
     ]
@@ -4237,8 +4239,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 625,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/82_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/82_hires.png",
+    "nationalPokedexNumber": 625
   },
   {
     "id": "xy1-83",
@@ -4283,8 +4285,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 679,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/83_hires.png",
+    "nationalPokedexNumber": 679,
     "evolvesTo": [
       "Doublade"
     ]
@@ -4318,7 +4320,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -4334,8 +4336,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 680,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/84_hires.png",
+    "nationalPokedexNumber": 680,
     "evolvesTo": [
       "Aegislash"
     ]
@@ -4393,8 +4395,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 681,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/85_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/85_hires.png",
+    "nationalPokedexNumber": 681
   },
   {
     "id": "xy1-86",
@@ -4449,8 +4451,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 681,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/86_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/86_hires.png",
+    "nationalPokedexNumber": 681
   },
   {
     "id": "xy1-87",
@@ -4503,8 +4505,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/87_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -4553,8 +4555,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 39,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/88_hires.png",
+    "nationalPokedexNumber": 39,
     "evolvesTo": [
       "Wigglytuff"
     ]
@@ -4613,8 +4615,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/89_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/89_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "xy1-90",
@@ -4644,7 +4646,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 1,
-        "damage": "20x",
+        "damage": "20×",
         "text": "This attack does 20 damage times the amount of Energy attached to this Pokémon."
       },
       {
@@ -4671,8 +4673,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 40,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/90_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/90_hires.png",
+    "nationalPokedexNumber": 40
   },
   {
     "id": "xy1-91",
@@ -4729,8 +4731,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 122,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/91_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/91_hires.png",
+    "nationalPokedexNumber": 122
   },
   {
     "id": "xy1-92",
@@ -4784,8 +4786,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 682,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/92_hires.png",
+    "nationalPokedexNumber": 682,
     "evolvesTo": [
       "Aromatisse"
     ]
@@ -4841,8 +4843,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 683,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/93_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/93_hires.png",
+    "nationalPokedexNumber": 683
   },
   {
     "id": "xy1-94",
@@ -4896,8 +4898,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 684,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/94_hires.png",
+    "nationalPokedexNumber": 684,
     "evolvesTo": [
       "Slurpuff"
     ]
@@ -4952,8 +4954,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 685,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/95_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/95_hires.png",
+    "nationalPokedexNumber": 685
   },
   {
     "id": "xy1-96",
@@ -5009,8 +5011,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/96_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/96_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xy1-97",
@@ -5072,8 +5074,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/97_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/97_hires.png",
+    "nationalPokedexNumber": 716
   },
   {
     "id": "xy1-98",
@@ -5103,7 +5105,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       }
     ],
@@ -5119,8 +5121,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 84,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/98_hires.png",
+    "nationalPokedexNumber": 84,
     "evolvesTo": [
       "Dodrio"
     ]
@@ -5179,8 +5181,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 85,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/99_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/99_hires.png",
+    "nationalPokedexNumber": 85
   },
   {
     "id": "xy1-100",
@@ -5220,7 +5222,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 3,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip a coin for each damage counter on this Pokémon. This attack does 30 damage times the number of heads."
       }
     ],
@@ -5230,8 +5232,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 128,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/100_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/100_hires.png",
+    "nationalPokedexNumber": 128
   },
   {
     "id": "xy1-101",
@@ -5276,8 +5278,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 206,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/101_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/101_hires.png",
+    "nationalPokedexNumber": 206
   },
   {
     "id": "xy1-102",
@@ -5322,8 +5324,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 276,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/102_hires.png",
+    "nationalPokedexNumber": 276,
     "evolvesTo": [
       "Swellow"
     ]
@@ -5378,8 +5380,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 277,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/103_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/103_hires.png",
+    "nationalPokedexNumber": 277
   },
   {
     "id": "xy1-104",
@@ -5426,8 +5428,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 300,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/104_hires.png",
+    "nationalPokedexNumber": 300,
     "evolvesTo": [
       "Delcatty"
     ]
@@ -5479,8 +5481,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 301,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/105_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/105_hires.png",
+    "nationalPokedexNumber": 301
   },
   {
     "id": "xy1-106",
@@ -5521,8 +5523,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 399,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/106_hires.png",
+    "nationalPokedexNumber": 399,
     "evolvesTo": [
       "Bibarel"
     ]
@@ -5557,7 +5559,7 @@
           "Colorless"
         ],
         "convertedEnergyCost": 2,
-        "damage": "30x",
+        "damage": "30×",
         "text": "Flip 2 coins. This attack does 30 damage times the number of heads."
       },
       {
@@ -5578,8 +5580,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 400,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/107_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/107_hires.png",
+    "nationalPokedexNumber": 400
   },
   {
     "id": "xy1-108",
@@ -5627,8 +5629,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 506,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/108_hires.png",
+    "nationalPokedexNumber": 506,
     "evolvesTo": [
       "Herdier"
     ]
@@ -5682,8 +5684,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 507,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/109_hires.png",
+    "nationalPokedexNumber": 507,
     "evolvesTo": [
       "Stoutland"
     ]
@@ -5741,8 +5743,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 508,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/110_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/110_hires.png",
+    "nationalPokedexNumber": 508
   },
   {
     "id": "xy1-111",
@@ -5781,8 +5783,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 659,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/111_hires.png",
+    "nationalPokedexNumber": 659,
     "evolvesTo": [
       "Diggersby"
     ]
@@ -5837,8 +5839,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 660,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/112_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/112_hires.png",
+    "nationalPokedexNumber": 660
   },
   {
     "id": "xy1-113",
@@ -5892,8 +5894,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 661,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/113_hires.png",
+    "nationalPokedexNumber": 661,
     "evolvesTo": [
       "Fletchinder"
     ]
@@ -5941,8 +5943,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 676,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/114_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/114_hires.png",
+    "nationalPokedexNumber": 676
   },
   {
     "id": "xy1-115",
@@ -6415,8 +6417,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 3,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/141_hires.png",
+    "nationalPokedexNumber": 3,
     "evolvesTo": "M Venusaur-EX"
   },
   {
@@ -6472,8 +6474,8 @@
         "value": "×2"
       }
     ],
-    "nationalPokedexNumber": 9,
     "imageUrlHiRes": "https://images.pokemontcg.io/xy1/142_hires.png",
+    "nationalPokedexNumber": 9,
     "evolvesTo": "M Blastoise-EX"
   },
   {
@@ -6529,8 +6531,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 587,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/143_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/143_hires.png",
+    "nationalPokedexNumber": 587
   },
   {
     "id": "xy1-144",
@@ -6590,8 +6592,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 717,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/144_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/144_hires.png",
+    "nationalPokedexNumber": 717
   },
   {
     "id": "xy1-145",
@@ -6650,8 +6652,8 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 227,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/145_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/145_hires.png",
+    "nationalPokedexNumber": 227
   },
   {
     "id": "xy1-146",
@@ -6713,7 +6715,7 @@
         "value": "-20"
       }
     ],
-    "nationalPokedexNumber": 716,
-    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/146_hires.png"
+    "imageUrlHiRes": "https://images.pokemontcg.io/xy1/146_hires.png",
+    "nationalPokedexNumber": 716
   }
 ]